From patchwork Mon Dec 19 10:29:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 34457 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp2330204wrn; Mon, 19 Dec 2022 03:27:56 -0800 (PST) X-Google-Smtp-Source: AA0mqf6FbAobdmjUMdivmga6nzYQznCjXKoCfSLa1FZN0j0IDaw2p7D5arGSvTMJrYO5HSeeSqnR X-Received: by 2002:a17:906:a59:b0:7ad:a797:5bb9 with SMTP id x25-20020a1709060a5900b007ada7975bb9mr50028272ejf.29.1671449276019; Mon, 19 Dec 2022 03:27:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671449276; cv=none; d=google.com; s=arc-20160816; b=NBJWPrMrxelyFifBYDZyhIgjJzZICf2MXFxSC758cXcibxVy5xeFMxlkvxxM9HAUtr 1oUJVwrBlzx8eEX7vsdJ4Or6NZ8Bf3OnZoWQkB6mNiKxyLNs+51GtE5S6xq85xj0nQ5W OAmzhFtXchN32l4W5+4pRYAxwbUg/NIRGHC6K2HLhgC1+0xQNx/p39uOOfubXR5XprKd 4tK+1+2JgkWhva9dREzvT5qdJXyJieYRH2A1P+KpxgAOE2goTI51k7yLngqRlZ72pLfB 2fcvfFipwz0S7N693ewjOKmCoXNJoUlHbcgnbapkiHNfRlMUhKApDN3ZSk7ohwJly1hO uDmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-disposition:in-reply-to:mime-version:references:message-id :subject:cc:to:date:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=bVxCzxcB2YCZ94w5qLpXdqSkzXhLDyimycLo64liIsA=; b=zZriRxMOrYMt2h6UKAvpZg2ErOyBjqu2hf6MHHEOMwWdbJteC1NKtj9hkXgTFWA9FC 6BTrejGWSuV8JbIVPup+S9x4h8AKcYMVYVoTFW2nn8RyACiiSVWRBzeufnhclfTD5vnc M6CfiYMuTzs62fQzpv3R5N1yPo7AncojcbPGk7i6tP5OuEv1dX8OGZwR19MMRtQyHzh2 2MnTpr6P0r9E9QbgxloIMKPjBcfh7jkYrf2NxYhL1VDD94wcGfb8FCbpYxioNL8UVgxq FOXDk2ONy6iXvMAyyXAEAjnXSDOTMcB9oGA/4WkcAbD3HW+QD9AaDWFnzFwcil089ZgM 1HJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=q10PYzWw; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id gz23-20020a170906f2d700b0078db371355esi7640720ejb.987.2022.12.19.03.27.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Dec 2022 03:27:56 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=q10PYzWw; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 28D1D38386AE for ; Mon, 19 Dec 2022 10:42:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 28D1D38386AE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1671446541; bh=bVxCzxcB2YCZ94w5qLpXdqSkzXhLDyimycLo64liIsA=; h=Date:To:Cc:Subject:References:In-Reply-To:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=q10PYzWwaw44y+BBu+IO26pYKRJLNG+3ulcVxMwMn3hITN13LQGEn2V60VdnCGooM TDOeVRJxZA0dBigZqT7U7Pd2C+3VcPx4qd3nLEy8NpRRMNQEmiw5m16QI2Do9eDs52 IAl8W9axaFxrSdZ/rNwW7osQTHIIO7nSBzrAPsec= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id DBE773894DE3 for ; Mon, 19 Dec 2022 10:29:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DBE773894DE3 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-648-WjKCCztfMv-E4e1cDEEZxQ-1; Mon, 19 Dec 2022 05:29:29 -0500 X-MC-Unique: WjKCCztfMv-E4e1cDEEZxQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D030285C6E0; Mon, 19 Dec 2022 10:29:28 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.39.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8E5BC40C2064; Mon, 19 Dec 2022 10:29:28 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.17.1/8.17.1) with ESMTPS id 2BJATP22775369 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 19 Dec 2022 11:29:26 +0100 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 2BJATPw4775368; Mon, 19 Dec 2022 11:29:25 +0100 Date: Mon, 19 Dec 2022 11:29:24 +0100 To: Jerry D Cc: gfortran , gcc-patches Subject: [committed] testsuite: Fix up pr107397.f90 test [PR107397] Message-ID: References: <5dac7c39-c0e3-f7e7-8625-b672fc728e0c@gmail.com> MIME-Version: 1.0 In-Reply-To: <5dac7c39-c0e3-f7e7-8625-b672fc728e0c@gmail.com> X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-Spam-Status: No, score=-3.5 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jakub Jelinek via Gcc-patches From: Jakub Jelinek Reply-To: Jakub Jelinek Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752641596249852350?= X-GMAIL-MSGID: =?utf-8?q?1752641596249852350?= On Sat, Dec 17, 2022 at 09:12:43AM -0800, Jerry D via Gcc-patches wrote: > The attached patch fixes a regression and is a patch from Steve. I have > regression tested it and provided a test case. It is fairly simple and I > will commit under the "simple" rule in a little while. > > Thanks Steve for Patch. Thanks Harald for helping me get back up to speed on > the git magic. The pr107397.f90 test FAILs for me, one problem was that the added diagnostics has an indefinite article before BOZ, but the test dg-error didn't. The other problem was that on the other dg-error there was no space between the string and closing }, so it was completely ignored and the error was an excess error. 2022-12-19 Jakub Jelinek PR fortran/107397 * gfortran.dg/pr107397.f90: Adjust expected diagnostic wording and add space between dg-error string and closing }. Jakub --- gcc/testsuite/gfortran.dg/pr107397.f90.jj 2022-12-19 11:09:13.793166473 +0100 +++ gcc/testsuite/gfortran.dg/pr107397.f90 2022-12-19 11:23:02.981322107 +0100 @@ -4,6 +4,6 @@ program p type t real :: a = 1.0 end type - type(t), parameter :: x = z'1' ! { dg-error "incompatible with BOZ" } - x%a = x%a + 2 ! { dg-error "has no IMPLICIT type"} + type(t), parameter :: x = z'1' ! { dg-error "incompatible with a BOZ" } + x%a = x%a + 2 ! { dg-error "has no IMPLICIT type" } end