aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>2023-01-30 14:26:06 +0100
committerRainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>2023-01-30 14:26:06 +0100
commit7c4d1b7a44009c7b89f3aff6e014c4a19563e82e (patch)
tree74aac6a960bb6848ca2242a677d0edd5a401c1e9
parent876b3e0514bc8cb2256c44db56255403bedfa52d (diff)
downloadgcc-7c4d1b7a44009c7b89f3aff6e014c4a19563e82e.zip
gcc-7c4d1b7a44009c7b89f3aff6e014c4a19563e82e.tar.gz
gcc-7c4d1b7a44009c7b89f3aff6e014c4a19563e82e.tar.bz2
testsuite: Restore TORTURE_OPTIONS in gm2/warnings/returntype/fail/warnings-returntype-fail.exp
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. 2023-01-30 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> gcc/testsuite: * gm2/warnings/returntype/fail/warnings-returntype-fail.exp: Save, restore TORTURE_OPTIONS.
-rw-r--r--gcc/testsuite/gm2/warnings/returntype/fail/warnings-returntype-fail.exp4
1 files changed, 4 insertions, 0 deletions
diff --git a/gcc/testsuite/gm2/warnings/returntype/fail/warnings-returntype-fail.exp b/gcc/testsuite/gm2/warnings/returntype/fail/warnings-returntype-fail.exp
index aaebe1f..43e97ba 100644
--- 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 -nocomplain $srcdir/$subdir/*.mod]] {
gm2-torture-fail $testcase
}
+
+set TORTURE_OPTIONS $old_options