From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from esa4.mentor.iphmx.com (esa4.mentor.iphmx.com [68.232.137.252]) by sourceware.org (Postfix) with ESMTPS id 00ACA3858CDA for ; Thu, 30 Mar 2023 09:39:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 00ACA3858CDA Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com X-IronPort-AV: E=Sophos;i="5.98,303,1673942400"; d="scan'208,223";a="873767" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa4.mentor.iphmx.com with ESMTP; 30 Mar 2023 01:39:53 -0800 IronPort-SDR: XB8vWKCAK7Pag9CT49v3E5F5P+p1x040OfeenZq6w0svO9T4vrYt3BS6TNY8MaUsdRbhfiwx9W p9msultnvrVjQu3Lf/1CVzJrLlLRCcsyDO5mFnc+2l+nKEK1BmrN6dxXZyAlzOu8FEAAZs0ysE /o2m33mFAV07WbmxK9YHU8TWU6ckJ/HCJUvm6Z74hC2oYY5u/S2zWZyMA+M06wyGq132Pk2ZOz swHFpkXjiqCdtckICKtDmE41Saq+pIPLZ+ll3MXmAYRY5EU3AA9Sko9F3liOuC1oJodff+Svg9 sVQ= From: Thomas Schwinge To: Alexandre Oliva , CC: Jakub Jelinek , Richard Biener , Jason Merrill , , , Subject: Re: 'g++.dg/modules/modules.exp': don't leak local 'unsupported' proc [PR108899] In-Reply-To: References: <00f5cbe1-05b7-0e42-0b46-1e36d1e4e8b3@redhat.com> <87o7ob2usn.fsf@euler.schwinge.homeip.net> User-Agent: Notmuch/0.29.3+94~g74c3f1b (https://notmuchmail.org) Emacs/28.2 (x86_64-pc-linux-gnu) Date: Thu, 30 Mar 2023 11:39:45 +0200 Message-ID: <87pm8qpogu.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-13.mgc.mentorg.com (139.181.222.13) To svr-ies-mbx-10.mgc.mentorg.com (139.181.222.10) X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,HEADER_FROM_DIFFERENT_DOMAINS,KAM_DMARC_STATUS,SPF_HELO_PASS,SPF_PASS,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 List-Id: --=-=-= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi! On 2023-03-30T04:00:03-0300, Alexandre Oliva wrote: > On Mar 29, 2023, Thomas Schwinge wrote: >> But surely the curly braces in: > >> -UNSUPPORTED: g++.dg/modules/explicit-bool-1_a.H -std=3Dc++17 > >> +UNSUPPORTED: {g++.dg/modules/explicit-bool-1_a.H -std=3Dc++17} > >> ... are not intentional? (Alexandre?) > > Unintended indeed, will look, thanks for letting me know > > >> But worse, the latter also "bleeds into" all other testing > > Eeek > > Yeah, that's a much bigger problem indeed. > >> ..., this isn't sufficient. Instead, we should undo the 'rename' at the >> end of 'g++.dg/modules/modules.exp'. OK to push the attached >> "'g++.dg/modules/modules.exp': don't leak local 'unsupported' proc [PR10= 8899]" >> after proper testing? > > Ooh, nice, I didn't know how to drop the renaming after we were done > with it, and hoped the end of the .exp would have accomplished that by > ending a scope. Jakub had already pointed out this wasn't the case, but > I didn't realize, when he did, that this would carry over onto other > modules. > > If we're dropping the renaming, I suppose we could also revert Jakub's > change. Yes, my plan was to push a 'git revert' of Jakub's change as a follow-up (clean-up) *after* my proposed "'g++.dg/modules/modules.exp': don't leak local 'unsupported' proc [PR10889= 9]", see attached again. My testing has completed without issues; OK to push that one? > +# Restore the original unsupported proc, lest it will affect > +# subsequent test runs, or even fail renaming if we run modules.exp > +# for multiple targets/multilibs/options. > +rename unsupported {} > +rename modules-saved-unsupported unsupported Should I incorporate that comment instead of my simpler one? 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-g-.dg-modules-modules.exp-don-t-leak-local-unsupport.patch" >From b5c6fae2467cf4245f379269792559b8c00eca58 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Wed, 29 Mar 2023 21:11:19 +0200 Subject: [PATCH] 'g++.dg/modules/modules.exp': don't leak local 'unsupported' proc [PR108899] Fix-up for commit 5344482c4d3ae0618fa8f5ed38f8309db43fdb82 "testsuite: Skip module_cmi_p and related unsupported module test". PR testsuite/108899 gcc/testsuite/ * g++.dg/modules/modules.exp: Don't leak local 'unsupported' proc. --- gcc/testsuite/g++.dg/modules/modules.exp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gcc/testsuite/g++.dg/modules/modules.exp b/gcc/testsuite/g++.dg/modules/modules.exp index e66b2082f20..23c4bac2e89 100644 --- a/gcc/testsuite/g++.dg/modules/modules.exp +++ b/gcc/testsuite/g++.dg/modules/modules.exp @@ -408,4 +408,8 @@ foreach src [lsort [find $srcdir/$subdir {*_a.[CHX}]] { } } +# Restore the saved 'unsupported' proc. +rename unsupported {} +rename saved-unsupported unsupported + dg-finish -- 2.25.1 --=-=-=--