From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from esa2.mentor.iphmx.com (esa2.mentor.iphmx.com [68.232.141.98]) by sourceware.org (Postfix) with ESMTPS id 165B7396E018 for ; Tue, 17 Aug 2021 07:00:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 165B7396E018 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com IronPort-SDR: pA/OgJZUiI0LIAPnKoBhnWKTl0KVl39okYJCe1+6QZ7VEsnlRGJEZEtcVri79RIaMhcW5d7dG+ VNcEZm3KD0/jhrTomfEqhqzbOB31VgRnE/F6TubPSWqgPuP85CuHqcKMAgiTgrUp5Xva2K8W8e 1ZY61iRvmYnyf3enm4LmzTrayC3aPIFNlgUv6Z8c0LVYzQogfUGX6wlZenqQY+ZMnDmErNMkl7 H0laQiXqCJh/16N5+aepWgJQ1uBT5V1QRyBaeOHBFTHukHuYayIjGa6G/CjjIbvhhG+6GVNxpM 2v0Fwf6EC8JTbP6xpnIDrS6t X-IronPort-AV: E=Sophos;i="5.84,328,1620720000"; d="scan'208,223";a="64777282" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa2.mentor.iphmx.com with ESMTP; 16 Aug 2021 23:00:54 -0800 IronPort-SDR: MUO13zeh7/8XA6oqtm6J0CddVuHdzvi3WuBzzhX/G7jscfPiPCYcJuVfSRNAzNh4Yg5tWJxMR5 Klt7OopwzyvvxFeU92/yO//hhm/ZmPmVlSx0e4m7y4USill5NKZaMJgLGleC7OnLJC2mm4b8TE gE61LHIVBfeMblgdjg4h0lhKwYCz9lLgdq6Aqu2kbqq9jqScLjGbVRimU+quuToIfgjgJzj+1S kfCJNyUy5KqZEZUVpEbyMZcSR4MWHBz/57t2vl3FGKbq5Ho9nQyQTVf0uVBOF6HdC4ZRvOtwJu bvo= From: Thomas Schwinge To: David Malcolm , , "Rainer Orth" , Mike Stump Subject: Re: [committed] Introduce selftest::locate_file (v5) In-Reply-To: <1481769065-53621-1-git-send-email-dmalcolm@redhat.com> References: <1481769065-53621-1-git-send-email-dmalcolm@redhat.com> User-Agent: Notmuch/0.29.3+94~g74c3f1b (https://notmuchmail.org) Emacs/27.1 (x86_64-pc-linux-gnu) Date: Tue, 17 Aug 2021 09:00:45 +0200 Message-ID: <877dgk7dya.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) To svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, KAM_SHORT, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Tue, 17 Aug 2021 07:01:06 -0000 --=-=-= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi! On 2016-12-14T21:31:05-0500, David Malcolm wrote: > On Wed, 2016-12-14 at 15:02 +0100, Bernd Schmidt wrote: >> On 12/09/2016 08:32 PM, David Malcolm wrote: >> > Thanks. Unfortunately, applying the "locate_file" patch >> > https://gcc.gnu.org/ml/gcc-patches/2016-11/msg01186.html >> > would now introduce a regression in a recently-added test case: >> >> > The problem is that this DejaGnu test case uses -fself-test, and >> > doesn't provide any arguments. With the locate_file patch, we need to >> > pass the path to $(srcdir)/testsuite/selftests as an argument to -fsel= f >> > -test, and it's not clear to me how to do that sanely in a DejaGnu tes= t >> > case Rather simple, actually -- once you realize how all this works. ;-) >> > if I pass in a dummy value (like for pr71591.c), then the >> > selftests that use locate_file fail. > I've committed the following updated version to trunk (as r243681). > > Changed in v5: > * disable DejaGnu test for PR 78213 > > Successfully bootstrapped®rtested on x86_64-pc-linux-gnu (with 2 PASS > results converted to 1 UNSUPPORTED in gcc.sum, re gcc.dg/pr78213.c). > --- a/gcc/testsuite/gcc.dg/pr78213.c > +++ b/gcc/testsuite/gcc.dg/pr78213.c > @@ -1,6 +1,13 @@ > /* { dg-do compile } */ > /* { dg-options "-fself-test" } */ > > +/* When this test was written -fself-test took no argument, but it > + has subsequently gained a mandatory argument, giving the path > + to selftest support files (within the srcdir). > + It's not clear how to provide this path sanely from > + within DejaGnu, so for now, this test is disabled. */ > +/* { dg-skip-if "" { *-*-* } } */ > + > /* Verify that -fself-test does not fail on a non empty source. */ > > int i; = void bar(); = void foo() OK to push the attached "Restore 'gcc.dg/pr78213.c' testing" to master branch? See 'git grep --cached 'dg-.*options .*\$' -- */testsuite/' for pre-existing '$srcdir' usage in DejaGnu directives. Gr=C3=BC=C3=9Fe Thomas ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstra=C3=9Fe 201= , 80634 M=C3=BCnchen; Gesellschaft mit beschr=C3=A4nkter Haftung; Gesch=C3= =A4ftsf=C3=BChrer: Thomas Heurung, Frank Th=C3=BCrauf; Sitz der Gesellschaf= t: M=C3=BCnchen; Registergericht M=C3=BCnchen, HRB 106955 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename="0001-Restore-gcc.dg-pr78213.c-testing.patch" >From 84c75f25c05dde591b6ee74d7aacbc3bfec640d3 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Tue, 17 Aug 2021 08:45:18 +0200 Subject: [PATCH] Restore 'gcc.dg/pr78213.c' testing ... after it had gotten disabled in r243681 (Git commit ecfc21ff34ddc6f8aa517251fb51494c68ff741f) "Introduce selftest::locate_file". gcc/testsuite/ * gcc.dg/pr78213.c: Restore testing. --- gcc/testsuite/gcc.dg/pr78213.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/gcc/testsuite/gcc.dg/pr78213.c b/gcc/testsuite/gcc.dg/pr78213.c index ebc2cce78f4..40dd3c82b60 100644 --- a/gcc/testsuite/gcc.dg/pr78213.c +++ b/gcc/testsuite/gcc.dg/pr78213.c @@ -1,12 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-fself-test" } */ - -/* When this test was written -fself-test took no argument, but it - has subsequently gained a mandatory argument, giving the path - to selftest support files (within the srcdir). - It's not clear how to provide this path sanely from - within DejaGnu, so for now, this test is disabled. */ -/* { dg-skip-if "" { *-*-* } } */ +/* { dg-options "-fself-test=$srcdir/selftests" } */ /* Verify that -fself-test does not fail on a non empty source. */ -- 2.30.2 --=-=-=--