[COMMITTED] testsuite: Restore TORTURE_OPTIONS in gm2/warnings/returntype/fail/warnings-returntype-fail.exp

[COMMITTED] testsuite: Restore TORTURE_OPTIONS in gm2/warnings/returntype/fail/warnings-returntype-fail.exp

[Rainer Orth]

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

Between 20230126 and 20230127, 1100+ gm2 tests started to FAIL for the
non-default multilib, e.g.

FAIL: gm2/calling-c/datatypes/unbounded/run/pass/m.mod compilation, {additional_flags= -O0 -g -Werror=return-type } timeout=10
UNRESOLVED: gm2/calling-c/datatypes/unbounded/run/pass/m.mod execution, {additional_flags= -O0 -g -Werror=return-type } timeout=10
FAIL: gm2/case/pass/testcase1.mod,  -O0 -g -Werror=return-type  
[...]
cc1gm2: warning: '-Werror=' argument '-Werror=return-type' is not valid for Modula-2

I'm seeing this on all of Solaris/x86, Solaris/SPARC, and Linux/x86_64.

I could trace this to
gm2/warnings/returntype/fail/warnings-returntype-fail.exp not properly
restoring TORTURE_OPTIONS.

Tested on i386-pc-solaris2.11 and sparc-sun-solaris2.11.  Installed on
trunk.

	Rainer

-- 
-----------------------------------------------------------------------------
Rainer Orth, Center for Biotechnology, Bielefeld University


2023-01-30  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>

	gcc/testsuite:
	* gm2/warnings/returntype/fail/warnings-returntype-fail.exp: Save,
	restore TORTURE_OPTIONS.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: wrf.patch --]
[-- Type: text/x-patch, Size: 734 bytes --]

diff --git a/gcc/testsuite/gm2/warnings/returntype/fail/warnings-returntype-fail.exp b/gcc/testsuite/gm2/warnings/returntype/fail/warnings-returntype-fail.exp
--- a/gcc/testsuite/gm2/warnings/returntype/fail/warnings-returntype-fail.exp
+++ b/gcc/testsuite/gm2/warnings/returntype/fail/warnings-returntype-fail.exp
@@ -28,6 +28,8 @@ load_lib gm2-torture.exp
 gm2_init_pim "${srcdir}/gm2/warnings/returntype/fail"
 
 global TORTURE_OPTIONS
+
+set old_options $TORTURE_OPTIONS
 set TORTURE_OPTIONS { { -O0 -g -Werror=return-type } }
 
 foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.mod]] {
@@ -38,3 +40,5 @@ foreach testcase [lsort [glob -nocomplai
 
     gm2-torture-fail $testcase
 }
+
+set TORTURE_OPTIONS $old_options

Re: [COMMITTED] testsuite: Restore TORTURE_OPTIONS in gm2/warnings/returntype/fail/warnings-returntype-fail.exp

[Thomas Schwinge]

Hi!

On 2023-01-30T14:24:43+0100, Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> wrote:
> Between 20230126 and 20230127, 1100+ gm2 tests started to FAIL for the
> non-default multilib, e.g.
>
> FAIL: gm2/calling-c/datatypes/unbounded/run/pass/m.mod compilation, {additional_flags= -O0 -g -Werror=return-type } timeout=10
> UNRESOLVED: gm2/calling-c/datatypes/unbounded/run/pass/m.mod execution, {additional_flags= -O0 -g -Werror=return-type } timeout=10
> FAIL: gm2/case/pass/testcase1.mod,  -O0 -g -Werror=return-type
> [...]
> cc1gm2: warning: '-Werror=' argument '-Werror=return-type' is not valid for Modula-2
>
> I'm seeing this on all of Solaris/x86, Solaris/SPARC, and Linux/x86_64.

ACK.

> I could trace this to
> gm2/warnings/returntype/fail/warnings-returntype-fail.exp not properly
> restoring TORTURE_OPTIONS.
>
> Tested on i386-pc-solaris2.11 and sparc-sun-solaris2.11.  Installed on
> trunk.

ACK, thanks.


And note that this is independent of (or: complements) Iain's
commit r13-5473-gfe4608efc15b881ac908a3f90d7322736495ae72
"Modula-2: Claim Wreturn-type in lang.opt",
<https://inbox.sourceware.org/gcc-patches/20230128132353.77631-1-iain@sandoe.co.uk>,
which remains necessary for:
'gm2/warnings/returntype/pass/Termbase.mod',
'gm2/warnings/returntype/pass/goodreturn.mod',
'gm2/warnings/returntype/pass/keypressedsimple.mod'.


Grüße
 Thomas


> 2023-01-30  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
>
>       gcc/testsuite:
>       * gm2/warnings/returntype/fail/warnings-returntype-fail.exp: Save,
>       restore TORTURE_OPTIONS.
>
> diff --git a/gcc/testsuite/gm2/warnings/returntype/fail/warnings-returntype-fail.exp b/gcc/testsuite/gm2/warnings/returntype/fail/warnings-returntype-fail.exp
> --- a/gcc/testsuite/gm2/warnings/returntype/fail/warnings-returntype-fail.exp
> +++ b/gcc/testsuite/gm2/warnings/returntype/fail/warnings-returntype-fail.exp
> @@ -28,6 +28,8 @@ load_lib gm2-torture.exp
>  gm2_init_pim "${srcdir}/gm2/warnings/returntype/fail"
>
>  global TORTURE_OPTIONS
> +
> +set old_options $TORTURE_OPTIONS
>  set TORTURE_OPTIONS { { -O0 -g -Werror=return-type } }
>
>  foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.mod]] {
> @@ -38,3 +40,5 @@ foreach testcase [lsort [glob -nocomplai
>
>      gm2-torture-fail $testcase
>  }
> +
> +set TORTURE_OPTIONS $old_options
-----------------
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

Re: [COMMITTED] testsuite: Restore TORTURE_OPTIONS in gm2/warnings/returntype/fail/warnings-returntype-fail.exp

[Rainer Orth]

Hi Thomas,

> And note that this is independent of (or: complements) Iain's
> commit r13-5473-gfe4608efc15b881ac908a3f90d7322736495ae72
> "Modula-2: Claim Wreturn-type in lang.opt",
> <https://inbox.sourceware.org/gcc-patches/20230128132353.77631-1-iain@sandoe.co.uk>,
> which remains necessary for:
> 'gm2/warnings/returntype/pass/Termbase.mod',
> 'gm2/warnings/returntype/pass/goodreturn.mod',
> 'gm2/warnings/returntype/pass/keypressedsimple.mod'.

indeed: those failures happened for the default multilib, while the ones
I observed affect the non-default ones.

	Rainer

-- 
-----------------------------------------------------------------------------
Rainer Orth, Center for Biotechnology, Bielefeld University

Re: [COMMITTED] testsuite: Restore TORTURE_OPTIONS in gm2/warnings/returntype/fail/warnings-returntype-fail.exp

[Gaius Mulley]

Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> writes:

> Between 20230126 and 20230127, 1100+ gm2 tests started to FAIL for the
> non-default multilib, e.g.
>
> FAIL: gm2/calling-c/datatypes/unbounded/run/pass/m.mod compilation, {additional_flags= -O0 -g -Werror=return-type } timeout=10
> UNRESOLVED: gm2/calling-c/datatypes/unbounded/run/pass/m.mod execution, {additional_flags= -O0 -g -Werror=return-type } timeout=10
> FAIL: gm2/case/pass/testcase1.mod,  -O0 -g -Werror=return-type  
> [...]
> cc1gm2: warning: '-Werror=' argument '-Werror=return-type' is not valid for Modula-2
>
> I'm seeing this on all of Solaris/x86, Solaris/SPARC, and Linux/x86_64.
>
> I could trace this to
> gm2/warnings/returntype/fail/warnings-returntype-fail.exp not properly
> restoring TORTURE_OPTIONS.
>
> Tested on i386-pc-solaris2.11 and sparc-sun-solaris2.11.  Installed on
> trunk.
>
> 	Rainer

apologies and many thanks for detecting and fixing this bug

regards,
Gaius