Re: 'g++.dg/modules/modules.exp': don't leak local 'unsupported' proc [PR108899]

[Thomas Schwinge <thomas@codesourcery.com>]

[-- Attachment #1: Type: text/plain, Size: 2114 bytes --]

Hi!

On 2023-03-30T04:00:03-0300, Alexandre Oliva <oliva@adacore.com> wrote:
> On Mar 29, 2023, Thomas Schwinge <thomas@codesourcery.com> wrote:
>> But surely the curly braces in:
>
>>     -UNSUPPORTED: g++.dg/modules/explicit-bool-1_a.H -std=c++17
>
>>     +UNSUPPORTED: {g++.dg/modules/explicit-bool-1_a.H -std=c++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 [PR108899]"
>> 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 [PR108899]",
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üße
 Thomas


-----------------
Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-g-.dg-modules-modules.exp-don-t-leak-local-unsupport.patch --]
[-- Type: text/x-diff, Size: 1019 bytes --]

From b5c6fae2467cf4245f379269792559b8c00eca58 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@codesourcery.com>
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