[gcc r13-5494] testsuite: Restore TORTURE_OPTIONS in gm2/warnings/returntype/fail/warnings-returntype-fail.exp

[gcc r13-5494] testsuite: Restore TORTURE_OPTIONS in gm2/warnings/returntype/fail/warnings-returntype-fail.exp

[Rainer Orth]

https://gcc.gnu.org/g:7c4d1b7a44009c7b89f3aff6e014c4a19563e82e

commit r13-5494-g7c4d1b7a44009c7b89f3aff6e014c4a19563e82e
Author: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Date:   Mon Jan 30 14:26:06 2023 +0100

    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.

Diff:
---
 .../gm2/warnings/returntype/fail/warnings-returntype-fail.exp         | 4 ++++
 1 file changed, 4 insertions(+)

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 aaebe1f07dd..43e97babec7 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