From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id DD740385DC30 for ; Fri, 30 Apr 2021 13:20:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org DD740385DC30 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-480-O5LTck5oPTiILm3rveQtTg-1; Fri, 30 Apr 2021 09:20:48 -0400 X-MC-Unique: O5LTck5oPTiILm3rveQtTg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 80BAB18B9ECA; Fri, 30 Apr 2021 13:20:47 +0000 (UTC) Received: from tucnak.zalov.cz (ovpn-114-59.ams2.redhat.com [10.36.114.59]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 15B7270598; Fri, 30 Apr 2021 13:20:46 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.16.1/8.16.1) with ESMTPS id 13UDKiMF3057889 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Fri, 30 Apr 2021 15:20:44 +0200 Received: (from jakub@localhost) by tucnak.zalov.cz (8.16.1/8.16.1/Submit) id 13UDKhQ43057888; Fri, 30 Apr 2021 15:20:43 +0200 Date: Fri, 30 Apr 2021 15:20:43 +0200 From: Jakub Jelinek To: Jason Merrill Cc: gcc-patches@gcc.gnu.org, Nathan Sidwell Subject: [committed] testsuite: Adjust expected error in a testcase [PR98358] Message-ID: <20210430132043.GP1179226@tucnak> Reply-To: Jakub Jelinek References: <20210423115511.GY1179226@tucnak> MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-5.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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-List-Received-Date: Fri, 30 Apr 2021 13:20:52 -0000 On Fri, Apr 23, 2021 at 05:24:00PM -0400, Jason Merrill via Gcc wrote: > On Fri, Apr 23, 2021 at 7:55 AM Jakub Jelinek wrote: > > > > Status > > ====== > > > > GCC 8.5 release and closing of the 8 branch is several months overdue, > > we don't have enough time to maintain trunk and 4 supported release branches. > > Therefore, I'd like to do 8.5-rc1 on 7th of May and release 8.5 and close > > the branch a week after that. > > We have one P1 bug though - P98358 - it is unclear if just changing the > > testcase is all that is needed or if some C++ FE changes are needed. > > The error message quoted in the PR looks correct, so I think changing > the testcase is sufficient. Ok, thanks, I've committed the following patch to 8.5 after testing it on x86_64-linux: 2021-04-30 Jakub Jelinek PR c++/98358 * g++.dg/template/pr98297.C: Expect error about shadowing template template parameter rather than does not declare anything error. --- gcc/testsuite/g++.dg/template/pr98297.C.jj 2021-04-22 15:48:48.099179790 +0200 +++ gcc/testsuite/g++.dg/template/pr98297.C 2021-04-30 15:13:57.037421448 +0200 @@ -2,5 +2,5 @@ // { dg-do compile { target c++11 } } template