--- a/RegressionTests__CompilerTest.st	Thu Nov 16 14:43:08 2006 +0100
+++ b/RegressionTests__CompilerTest.st	Thu Nov 16 14:58:25 2006 +0100
@@ -1294,46 +1294,64 @@
 !CompilerTest methodsFor:'tests - return'!
 
 test_bad_return2
-    ParserFlags warnAboutPossibleSTCCompilationProblems:true.
-    ParserFlags allowPossibleSTCCompilationProblems:false.
-
-    self 
-        should:
-            [
-                Compiler 
-                    compile:'
+    |w a|
+
+    w := ParserFlags warnAboutPossibleSTCCompilationProblems.
+    a := ParserFlags allowPossibleSTCCompilationProblems.
+
+    [
+        ParserFlags warnAboutPossibleSTCCompilationProblems:true.
+        ParserFlags allowPossibleSTCCompilationProblems:false.
+
+        self 
+            should:
+                [
+                    Compiler 
+                        compile:'
 foo:arg
     ^ arg 
         ifTrue:[^ 1] 
         ifFalse:[2]
 '
-                    forClass:self class.
-            ]
-        raise:Parser::ParseError.
+                        forClass:self class.
+                ]
+            raise:Parser::ParseError.
+    ] ensure:[
+        ParserFlags warnAboutPossibleSTCCompilationProblems:w.
+        ParserFlags allowPossibleSTCCompilationProblems:a.
+    ].
 
     "Created: / 16-11-2006 / 14:08:48 / cg"
 !
 
 test_bad_return3
-    |setOfSignals|
-
-    ParserFlags warnAboutPossibleSTCCompilationProblems:false.
-    ParserFlags allowPossibleSTCCompilationProblems:true.
-
-    setOfSignals := SignalSet with:(Parser::ParseError) with:(Parser::ParseWarning).
-    self 
-        shouldnt:
-            [
-                Compiler 
-                    compile:'
+    |w a setOfSignals|
+
+    w := ParserFlags warnAboutPossibleSTCCompilationProblems.
+    a := ParserFlags allowPossibleSTCCompilationProblems.
+
+    [
+        ParserFlags warnAboutPossibleSTCCompilationProblems:false.
+        ParserFlags allowPossibleSTCCompilationProblems:true.
+
+        setOfSignals := SignalSet with:(Parser::ParseError) with:(Parser::ParseWarning).
+        self 
+            shouldnt:
+                [
+                    Compiler 
+                        compile:'
 foo:arg
     ^ arg 
         ifTrue:[^ 1] 
         ifFalse:[2]
 '
-                    forClass:self class.
-            ]
-        raise:setOfSignals.
+                        forClass:self class.
+                ]
+            raise:setOfSignals.
+    ] ensure:[
+        ParserFlags warnAboutPossibleSTCCompilationProblems:w.
+        ParserFlags allowPossibleSTCCompilationProblems:a.
+    ]
 
     "Created: / 16-11-2006 / 14:33:29 / cg"
 !