From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by sourceware.org (Postfix) with ESMTP id 504003858D34 for ; Sat, 18 Jul 2020 21:11:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 504003858D34 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-501-Gf7pqSAWNEa1tGKp2IDYmw-1; Sat, 18 Jul 2020 17:11:29 -0400 X-MC-Unique: Gf7pqSAWNEa1tGKp2IDYmw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C407C10059AA; Sat, 18 Jul 2020 21:11:27 +0000 (UTC) Received: from tucnak.zalov.cz (ovpn-112-218.ams2.redhat.com [10.36.112.218]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4A8655D9D7; Sat, 18 Jul 2020 21:11:27 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.15.2/8.15.2) with ESMTP id 06ILBOg1007562; Sat, 18 Jul 2020 23:11:25 +0200 Received: (from jakub@localhost) by tucnak.zalov.cz (8.15.2/8.15.2/Submit) id 06ILBNOU007561; Sat, 18 Jul 2020 23:11:23 +0200 Date: Sat, 18 Jul 2020 23:11:23 +0200 From: Jakub Jelinek To: David Edelsohn Cc: Hans-Peter Nilsson , GCC Patches , Nathan Sidwell Subject: Re: pragma-eof.c Message-ID: <20200718211123.GO2363@tucnak> Reply-To: Jakub Jelinek References: MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/1.11.3 (2019-02-01) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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=-7.7 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_H3, 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: Sat, 18 Jul 2020 21:11:32 -0000 On Sat, Jul 18, 2020 at 05:04:56PM -0400, David Edelsohn via Gcc-patches wrote: > H-P, > > After your patch to the testsuite, the cpp/pragma-eof.c testcase is > failing on all targets. Would you please investigate and fix? That is because the dg-error directive had line number of the last line in the file (without EOL) and the added line changed that. I've committed following, tested on x86_64-linux, committed to trunk as obvious. 2020-07-18 Jakub Jelinek * c-c++-common/cpp/pragma-eof.c: Use .+3 instead of 6 in dg-error. --- gcc/testsuite/c-c++-common/cpp/pragma-eof.c.jj 2020-07-18 10:49:16.000000000 +0200 +++ gcc/testsuite/c-c++-common/cpp/pragma-eof.c 2020-07-18 23:08:31.565619340 +0200 @@ -1,7 +1,7 @@ /* { dg-require-effective-target fopenmp } */ /* { dg-additional-options -fopenmp } */ -/* { dg-error "expected" "" { target *-*-* } 6 } */ +/* { dg-error "expected" "" { target *-*-* } .+3 } */ /* Make sure we see pragma_eol even though lacking new line. * /* no newline at end of file. */ #pragma omp parallel \ No newline at end of file Jakub