More variable cleansing

1 files changed, 189 insertions, 180 deletions

diff --git a/tests/info.test b/tests/info.test
index f983a0c..7e89d8e 100644
--- a/tests/info.test
+++ b/tests/info.test
@@ -13,9 +13,9 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: info.test,v 1.68 2009/10/28 21:03:19 dgp Exp $
+# RCS: @(#) $Id: info.test,v 1.69 2009/10/29 22:20:12 dkf Exp $
 
-if {[lsearch [namespace children] ::tcltest] == -1} {
+if {{::tcltest} ni [namespace children]} {
     package require tcltest 2
     namespace import -force ::tcltest::*
 }
@@ -84,7 +84,7 @@ test info-2.4 {info body option} {
 # would return the bytecompiled version of foo, which the catch
 # would then try and eval out of the foo context, accessing
 # compiled local indices
-test info-2.5 {info body option, returning bytecompiled bodies} {
+test info-2.5 {info body option, returning bytecompiled bodies} -body {
     catch {unset args}
     proc foo {args} {
 	foreach v $args {
@@ -93,8 +93,8 @@ test info-2.5 {info body option, returning bytecompiled bodies} {
 	}
     }
     foo a
-    list [catch [info body foo] msg] $msg
-} {1 {can't read "args": no such variable}}
+    eval [info body foo]
+} -returnCodes error -result {can't read "args": no such variable}
 # Fix for problem tested for in info-2.5 caused problems when
 # procedure body had no string rep (i.e. was not yet bytecode)
 # causing an empty string to be returned [Bug #545644]
@@ -108,35 +108,35 @@ proc testinfocmdcount {} {
     set x [info cmdcount]
     set y 12345
     set z [info cm]
-    expr $z-$x
+    expr {$z-$x}
 }
 test info-3.1 {info cmdcount compiled} {
     testinfocmdcount
 } 4
-test info-3.2 {info cmdcount evaled} {
+test info-3.2 {info cmdcount evaled} -body {
     set x [info cmdcount]
     set y 12345
     set z [info cm]
-    expr $z-$x
-} 4
-test info-3.3 {info cmdcount evaled} [info body testinfocmdcount] 4
+    expr {$z-$x}
+} -cleanup {unset x y z} -result 4
+test info-3.3 {info cmdcount evaled} -body [info body testinfocmdcount] -cleanup {unset x y z} -result 4
 test info-3.4 {info cmdcount option} -body {
     info cmdcount 1
 } -returnCodes error -result {wrong # args: should be "info cmdcount"}
 
-test info-4.1 {info commands option} {
+test info-4.1 {info commands option} -body {
     proc t1 {} {}
     proc t2 {} {}
     set x " [info commands] "
     list [string match {* t1 *} $x] [string match {* t2 *} $x] \
             [string match {* set *} $x] [string match {* list *} $x]
-} {1 1 1 1}
-test info-4.2 {info commands option} {
+} -cleanup {unset x} -result {1 1 1 1}
+test info-4.2 {info commands option} -body {
     proc t1 {} {}
     rename t1 {}
-    set x [info comm]
-    string match {* t1 *} $x
-} 0
+    string match {* t1 *} \
+	[info comm]
+} -result 0
 test info-4.3 {info commands option} {
     proc _t1_ {} {}
     proc _t2_ {} {}
@@ -177,28 +177,28 @@ test info-6.1 {info default option} {
     proc t1 {a b {c d} {e "long default value"}} {}
     info default t1 a value
 } 0
-test info-6.2 {info default option} {
+test info-6.2 {info default option} -body {
     proc t1 {a b {c d} {e "long default value"}} {}
     set value 12345
     info d t1 a value
-    set value
-} {}
-test info-6.3 {info default option} {
+    return $value
+} -cleanup {unset value} -result {}
+test info-6.3 {info default option} -body {
     proc t1 {a b {c d} {e "long default value"}} {}
     info default t1 c value
-} 1
-test info-6.4 {info default option} {
+} -cleanup {unset value} -result 1
+test info-6.4 {info default option} -body {
     proc t1 {a b {c d} {e "long default value"}} {}
     set value 12345
     info default t1 c value
-    set value
-} d
-test info-6.5 {info default option} {
+    return $value
+} -cleanup {unset value} -result d
+test info-6.5 {info default option} -body {
     proc t1 {a b {c d} {e "long default value"}} {}
     set value 12345
     set x [info default t1 e value]
     list $x $value
-} {1 {long default value}}
+} -cleanup {unset x value} -result {1 {long default value}}
 test info-6.6 {info default option} -returnCodes error -body {
     info default a b
 } -result {wrong # args: should be "info default procname arg varname"}
@@ -211,14 +211,14 @@ test info-6.8 {info default option} -returnCodes error -body {
 } -result {procedure "t1" doesn't have an argument "x"}
 test info-6.9 {info default option} -returnCodes error -setup {
     catch {unset a}
-} -body {
+} -cleanup {unset a} -body {
     set a(0) 88
     proc t1 {a b} {}
     info default t1 a a
 } -returnCodes error -result {couldn't store default value in variable "a"}
 test info-6.10 {info default option} -setup {
     catch {unset a}
-} -body {
+} -cleanup {unset a} -body {
     set a(0) 88
     proc t1 {{a 18} b} {}
     info default t1 a a
@@ -230,27 +230,27 @@ test info-6.11 {info default option} {
         list [info default p x foo] $foo [info default q y bar] $bar
     }
 } {0 {} 1 27}
-catch {unset a}
 
-test info-7.1 {info exists option} {
+
+test info-7.1 {info exists option} -body {
     set value foo
     info exists value
-} 1
-catch {unset _nonexistent_}
-test info-7.2 {info exists option} {
+} -cleanup {unset value} -result 1
+
+test info-7.2 {info exists option} -setup {catch {unset _nonexistent_}} -body {
     info exists _nonexistent_
-} 0
+} -result 0
 test info-7.3 {info exists option} {
     proc t1 {x} {return [info exists x]}
     t1 2
 } 1
-test info-7.4 {info exists option} {
+test info-7.4 {info exists option} -body {
     proc t1 {x} {
         global _nonexistent_
         return [info exists _nonexistent_]
     }
     t1 2
-} 0
+} -setup {unset -nocomplain _nonexistent_} -result 0
 test info-7.5 {info exists option} {
     proc t1 {x} {
         set y 47
@@ -276,29 +276,29 @@ test info-7.9 {info exists option} -body {
     info exists 1 2
 } -returnCodes error -result {wrong # args: should be "info exists varName"}
 
-test info-8.1 {info globals option} {
+test info-8.1 {info globals option} -body {
     set x 1
     set y 2
     set value 23
     set a " [info globals] "
     list [string match {* x *} $a] [string match {* y *} $a] \
             [string match {* value *} $a] [string match {* _foobar_ *} $a]
-} {1 1 1 0}
-test info-8.2 {info globals option} {
+} -cleanup {unset x y value a} -result {1 1 1 0}
+test info-8.2 {info globals option} -body {
     set _xxx1 1
     set _xxx2 2
     lsort [info g _xxx*]
-} {_xxx1 _xxx2}
+} -cleanup {unset _xxx1 _xxx2} -result {_xxx1 _xxx2}
 test info-8.3 {info globals option} -returnCodes error -body {
     info globals 1 2
 } -result {wrong # args: should be "info globals ?pattern?"}
-test info-8.4 {info globals option: may have leading namespace qualifiers} {
+test info-8.4 {info globals option: may have leading namespace qualifiers} -body {
     set x 0
     list [info globals x] [info globals :x] [info globals ::x] [info globals :::x] [info globals ::::x]
-} {x {} x x x}
+} -cleanup {unset x} -result {x {} x x x}
 test info-8.5 {info globals option: only return existing global variables} {
     -setup {
-	catch {unset ::NO_SUCH_VAR}
+	unset -nocomplain ::NO_SUCH_VAR
 	proc evalInProc script {eval $script}
     }
     -body {
@@ -356,11 +356,11 @@ test info-9.9 {info level option} -body {
     proc t1 {x} {info level $x}
     t1 -3
 } -returnCodes error -result {bad level "-3"}
-test info-9.10 {info level option, namespaces} {
-    set msg [namespace eval t {info level 0}]
+test info-9.10 {info level option, namespaces} -body {
+    namespace eval t {info level 0}
+} -cleanup {
     namespace delete t
-    set msg
-} {namespace eval t {info level 0}}
+} -result {namespace eval t {info level 0}}
 test info-9.11 {info level option, aliases} -constraints knownBug -setup {
     proc w {x y z} {info level 0}
     interp alias {} a {} w a b
@@ -392,16 +392,16 @@ test info-10.3 {info library option} -body {
     unset tcl_library
     info library
 } -returnCodes error -result {no library has been specified for Tcl}
-set tcl_library $savedLibrary
+set tcl_library $savedLibrary; unset savedLibrary
 
 test info-11.1 {info loaded option} -body {
     info loaded a b
 } -returnCodes error -result {wrong # args: should be "info loaded ?interp?"}
-test info-11.2 {info loaded option} {
-    list [catch {info loaded {}}] [catch {info loaded gorp} msg] $msg
-} {0 1 {could not find interpreter "gorp"}}
+test info-11.2 {info loaded option} -body {
+    info loaded {}; info loaded gorp
+} -returnCodes error -result {could not find interpreter "gorp"}
 
-test info-12.1 {info locals option} {
+test info-12.1 {info locals option} -body {
     set a 22
     proc t1 {x y} {
         set b 13
@@ -412,7 +412,7 @@ test info-12.1 {info locals option} {
         return [info locals]
     }
     lsort [t1 23 24]
-} {b c x y}
+} -cleanup {unset a aa} -result {b c x y}
 test info-12.2 {info locals option} {
     proc t1 {x y} {
         set xx1 2
@@ -452,10 +452,10 @@ test info-13.1 {info nameofexecutable option} -returnCodes error -body {
     info nameofexecutable foo
 } -result {wrong # args: should be "info nameofexecutable"}
 
-test info-14.1 {info patchlevel option} {
+test info-14.1 {info patchlevel option} -body {
     set a [info patchlevel]
     regexp {[0-9]+\.[0-9]+([p[0-9]+)?} $a
-} 1
+} -cleanup {unset a} -result 1
 test info-14.2 {info patchlevel option} -returnCodes error -body {
     info patchlevel a
 } -result {wrong # args: should be "info patchlevel"}
@@ -465,16 +465,16 @@ test info-14.3 {info patchlevel option} -setup {
     unset tcl_patchLevel
     info patchlevel
 } -cleanup {
-    set tcl_patchLevel $t
+    set tcl_patchLevel $t; unset t
 } -returnCodes error -result {can't read "tcl_patchLevel": no such variable}
 
-test info-15.1 {info procs option} {
+test info-15.1 {info procs option} -body {
     proc t1 {} {}
     proc t2 {} {}
     set x " [info procs] "
     list [string match {* t1 *} $x] [string match {* t2 *} $x] \
             [string match {* _undefined_ *} $x]
-} {1 1 0}
+} -cleanup {unset x} -result {1 1 0}
 test info-15.2 {info procs option} {
     proc _tt1 {} {}
     proc _tt2 {} {}
@@ -573,32 +573,32 @@ test info-16.5 {resetting "info script" after errors} {
     catch {source _nonexistent_}
     file tail [info script]
 } "info.test"
-test info-16.6 {info script option} {
+test info-16.6 {info script option} -body {
     set script [info script]
     list [file tail [info script]] \
 	    [info script newname.txt] \
 	    [file tail [info script $script]]
-} [list info.test newname.txt info.test]
-test info-16.7 {info script option} {
+} -result [list info.test newname.txt info.test] -cleanup {unset script}
+test info-16.7 {info script option} -body {
     set script [info script]
     info script newname.txt
     list [source $gorpfile] [file tail [info script]] \
 	    [file tail [info script $script]]
-} [list $gorpfile newname.txt info.test]
+} -result [list $gorpfile newname.txt info.test] -cleanup {unset script}
 removeFile gorp.info
 set gorpfile [makeFile {list [info script] [info script foo.bar]} gorp.info]
 test info-16.8 {info script option} {
     list [source $gorpfile] [file tail [info script]]
 } [list [list $gorpfile foo.bar] info.test]
-removeFile gorp.info
+removeFile gorp.info; unset gorpfile
 
 test info-17.1 {info sharedlibextension option} -returnCodes error -body {
     info sharedlibextension foo
 } -result {wrong # args: should be "info sharedlibextension"}
 
-test info-18.1 {info tclversion option} {
+test info-18.1 {info tclversion option} -body {
     scan [info tclversion] "%d.%d%c" a b c
-} 2
+} -cleanup {unset -nocomplain a b c} -result 2
 test info-18.2 {info tclversion option} -body {
     info t 2
 } -returnCodes error -result {wrong # args: should be "info tclversion"}
@@ -608,10 +608,10 @@ test info-18.3 {info tclversion option} -body {
 } -returnCodes error -setup {
     set t $tcl_version
 } -cleanup {
-    set tcl_version $t
+    set tcl_version $t; unset t
 } -result {can't read "tcl_version": no such variable}
 
-test info-19.1 {info vars option} {
+test info-19.1 {info vars option} -body {
     set a 1
     set b 2
     proc t1 {x y} {
@@ -620,8 +620,8 @@ test info-19.1 {info vars option} {
         return [info vars]
     }
     lsort [t1 18 19]
-} {a b c x y}
-test info-19.2 {info vars option} {
+} -cleanup {unset a b} -result {a b c x y}
+test info-19.2 {info vars option} -body {
     set xxx1 1
     set xxx2 2
     proc t1 {xxa y} {
@@ -630,7 +630,7 @@ test info-19.2 {info vars option} {
         return [info vars x*]
     }
     lsort [t1 18 19]
-} {xxa xxx1 xxx2}
+} -cleanup {unset xxx1 xxx2} -result {xxa xxx1 xxx2}
 test info-19.3 {info vars option} {
     lsort [info vars]
 } [lsort [info globals]]
@@ -669,6 +669,7 @@ test info-20.4 {info functions option} {
 test info-20.5 {info functions option} -returnCodes error -body {
     info functions raise an error
 } -result {wrong # args: should be "info functions ?pattern?"}
+unset functions msg
 
 test info-21.1 {miscellaneous error conditions} -returnCodes error -body {
     info
@@ -691,12 +692,11 @@ test info-21.5 {miscellaneous error conditions} -returnCodes error -body {
 ## info frame
 
 ## Helper
-# For the more complex results we cut the file name down to remove
-# path dependencies, and we use only part of the first line of the
-# reported command. The latter is required because otherwise the whole
-# test case may appear in some results, but the result is part of the
-# testcase. An infinite string would be required to describe that. The
-# cutting-down breaks this.
+# For the more complex results we cut the file name down to remove path
+# dependencies, and we use only part of the first line of the reported
+# command. The latter is required because otherwise the whole test case may
+# appear in some results, but the result is part of the testcase. An infinite
+# string would be required to describe that. The cutting-down breaks this.
 
 proc reduce {frame} {
     set  pos [lsearch -exact $frame cmd]
@@ -751,7 +751,7 @@ test info-22.3 {info frame, current, relative} -match glob -body {
 } -result {type source line 750 file */info.test cmd {info frame 0} proc ::tcltest::RunTest}
 test info-22.4 {info frame, current, relative, nested} -match glob -body {
     set res [info frame 0]
-} -result {type source line 753 file */info.test cmd {info frame 0} proc ::tcltest::RunTest}
+} -result {type source line 753 file */info.test cmd {info frame 0} proc ::tcltest::RunTest} -cleanup {unset res}
 test info-22.5 {info frame, current, absolute} -constraints {!singleTestInterp} -match glob -body {
     reduce [info frame 7]
 } -result {type source line 756 file info.test cmd {info frame 7} proc ::tcltest::RunTest}
@@ -766,7 +766,7 @@ test info-22.8 {info frame, basic trace} -match glob -body {
 } -result {* {type source line 728 file info.test cmd {info frame $level} proc ::etrace level 0}
 * {type source line 765 file info.test cmd etrace proc ::tcltest::RunTest}
 * {type source line * file tcltest* cmd {uplevel 1 $script} proc ::tcltest::RunTest}}
-
+unset -nocomplain msg
 
 test info-23.0.0 {eval'd info frame} {!singleTestInterp} {
     eval {info frame}
@@ -780,14 +780,14 @@ test info-23.1.0 {eval'd info frame, semi-dynamic} {!singleTestInterp} {
 test info-23.1.1 {eval'd info frame, semi-dynamic} -constraints {singleTestInterp} -match glob -body {
     eval info frame
 } -result {1[12]}
-test info-23.2.0 {eval'd info frame, dynamic} {!singleTestInterp} {
+test info-23.2.0 {eval'd info frame, dynamic} -constraints {!singleTestInterp} -body {
     set script {info frame}
     eval $script
-} 8
+} -cleanup {unset script} -result 8
 test info-23.2.1 {eval'd info frame, dynamic} -constraints {singleTestInterp} -match glob -body {
     set script {info frame}
     eval $script
-} -result {1[12]}
+} -cleanup {unset script} -result {1[12]}
 test info-23.3 {eval'd info frame, literal} -match glob -body {
     eval {
 	info frame 0
@@ -796,11 +796,11 @@ test info-23.3 {eval'd info frame, literal} -match glob -body {
 test info-23.4 {eval'd info frame, semi-dynamic} {
     eval info frame 0
 } {type eval line 1 cmd {info frame 0} proc ::tcltest::RunTest}
-test info-23.5 {eval'd info frame, dynamic} {
+test info-23.5 {eval'd info frame, dynamic} -cleanup {unset script} -body {
     set script {info frame 0}
     eval $script
-} {type eval line 1 cmd {info frame 0} proc ::tcltest::RunTest}
-test info-23.6 {eval'd info frame, trace} -match glob -body {
+} -result {type eval line 1 cmd {info frame 0} proc ::tcltest::RunTest}
+test info-23.6 {eval'd info frame, trace} -match glob -cleanup {unset script} -body {
     set script {etrace}
     join [lrange [eval $script] 0 2] \n
 } -result {* {type source line 728 file info.test cmd {info frame $level} proc ::etrace level 0}
@@ -852,7 +852,7 @@ while {$flag} {
     namespace eval foo {}
     proc ::foo::bar {} {info frame 0}
     set flag 0
-}
+};unset flag
 
 test info-24.2 {info frame, interaction, while} -body {
     reduce [foo::bar]
@@ -879,7 +879,7 @@ foreach var val {
     namespace eval foo {}
     proc ::foo::bar {} {info frame 0}
     break
-}
+}; unset var
 
 test info-24.4 {info frame, interaction, foreach} -body {
     reduce [foo::bar]
@@ -959,7 +959,7 @@ test info-24.7 {info frame, interaction, dict for} {
     reduce [foo::bar]
 } {type source line 955 file info.test cmd {info frame 0} proc ::foo::bar level 0}
 
-namespace delete foo
+namespace delete foo; unset k v
 
 # -------------------------------------------------------------------------
 
@@ -974,7 +974,7 @@ test info-24.8 {info frame, interaction, dict with} {
 } {type source line 969 file info.test cmd {info frame 0} proc ::foo::bar level 0}
 
 namespace delete foo
-unset thedict
+unset thedict foo
 
 # -------------------------------------------------------------------------
 
@@ -982,14 +982,14 @@ namespace eval foo {}
 dict filter {foo bar} script {k v} {
     proc ::foo::bar {} {info frame 0}
     set x 1
-}
+}; unset k v x
 
 test info-24.9 {info frame, interaction, dict filter} {
     reduce [foo::bar]
 } {type source line 983 file info.test cmd {info frame 0} proc ::foo::bar level 0}
 
 namespace delete foo
-unset x
+#unset x
 
 # -------------------------------------------------------------------------
 
@@ -1012,19 +1012,19 @@ rename bar {}
 
 # -------------------------------------------------------------------------
 # More info-30.x test cases at the end of the file.
-test info-30.0 {bs+nl in literal words} {
+test info-30.0 {bs+nl in literal words} -cleanup {unset res} -body {
     if {1} {
 	set res \
 	    [reduce [info frame 0]];#1018
     }
-    set res
+    return $res
     # This was reporting line 3 instead of the correct 4 because the
     # bs+nl combination is subst by the parser before the 'if'
     # command, and the bcc, see the word. Fixed by recording the
     # offsets of all bs+nl sequences in literal words, then using the
     # information in the bcc and other places to bump line numbers when
     # parsing over the location. Also affected: testcases 22.8 and 23.6.
-} {type source line 1018 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+} -result {type source line 1018 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
 
 # -------------------------------------------------------------------------
 # See 24.0 - 24.5 for similar situations, using literal scripts.
@@ -1033,45 +1033,45 @@ set body {set flag 0
     set a c
     set res [info frame 0]} ;# line 3!
 
-test info-31.0 {ns eval, script in variable} {
+test info-31.0 {ns eval, script in variable} -body {
     namespace eval foo $body
-    set res
-} {type eval line 3 cmd {info frame 0} level 0}
-catch {namespace delete foo}
-
-test info-31.1 {if, script in variable} {
+    return $foo::res
+} -result {type eval line 3 cmd {info frame 0} level 0} -cleanup {
+    catch {namespace delete foo}
+}
+test info-31.1 {if, script in variable} -cleanup {unset res a flag} -body {
     if 1 $body
-    set res
-} {type eval line 3 cmd {info frame 0} proc ::tcltest::RunTest}
+    return $res
+} -result {type eval line 3 cmd {info frame 0} proc ::tcltest::RunTest}
 
-test info-31.1a {if, script in variable} {
+test info-31.1a {if, script in variable} -cleanup {unset res a flag} -body {
     if 1 then $body
-    set res
-} {type eval line 3 cmd {info frame 0} proc ::tcltest::RunTest}
+    return $res
+} -result {type eval line 3 cmd {info frame 0} proc ::tcltest::RunTest}
 
-test info-31.2 {while, script in variable} {
+test info-31.2 {while, script in variable} -cleanup {unset flag res a} -body {
     set flag 1
     while {$flag} $body
-    set res
-} {type eval line 3 cmd {info frame 0} proc ::tcltest::RunTest}
+    return $res
+} -result {type eval line 3 cmd {info frame 0} proc ::tcltest::RunTest}
 
 # .3 - proc - scoping prevent return of result ...
 
-test info-31.4 {foreach, script in variable} {
+test info-31.4 {foreach, script in variable} -cleanup {unset var res a flag} -body {
     foreach var val $body
     set res
-} {type eval line 3 cmd {info frame 0} proc ::tcltest::RunTest}
+} -result {type eval line 3 cmd {info frame 0} proc ::tcltest::RunTest}
 
-test info-31.5 {for, script in variable} {
+test info-31.5 {for, script in variable} -cleanup {unset flag res a} -body {
     set flag 1
     for {} {$flag} {} $body
-    set res
-} {type eval line 3 cmd {info frame 0} proc ::tcltest::RunTest}
+    return $res
+} -result {type eval line 3 cmd {info frame 0} proc ::tcltest::RunTest}
 
-test info-31.6 {eval, script in variable} {
+test info-31.6 {eval, script in variable} -cleanup {unset res a flag} -body {
     eval $body
-    set res
-} {type eval line 3 cmd {info frame 0} proc ::tcltest::RunTest}
+    return $res
+} -result {type eval line 3 cmd {info frame 0} proc ::tcltest::RunTest}
 
 # -------------------------------------------------------------------------
 
@@ -1083,7 +1083,7 @@ set body {
 
 namespace eval foo {}
 set x foo
-switch -exact -- $x $body
+switch -exact -- $x $body; unset body
 
 test info-31.7 {info frame, interaction, switch, dynamic} -body {
     reduce [foo::bar]
@@ -1317,10 +1317,10 @@ test info-37.0 {eval pure list, single line} -match glob -body {
 	break
     }]
     eval $cmd
-    set res
+    return $res
 } -result {* {type source line 728 file info.test cmd {info frame $level} proc ::etrace level 0}
 * {type eval line 2 cmd etrace proc ::tcltest::RunTest}
-* {type eval line 1 cmd foreac proc ::tcltest::RunTest}}
+* {type eval line 1 cmd foreac proc ::tcltest::RunTest}} -cleanup {unset foo cmd res b c}
 
 # -------------------------------------------------------------------------
 
@@ -1361,7 +1361,7 @@ test info-38.1 {location information for uplevel, dv, direct-var} -match glob -b
     join [lrange [uplevel \#0 $script] 0 2] \n
 } -result {* {type source line 728 file info.test cmd {info frame $level} proc ::etrace level 0}
 * {type eval line 3 cmd etrace proc ::tcltest::RunTest}
-* {type source line 1361 file info.test cmd {uplevel \\#0 $script} proc ::tcltest::RunTest}}
+* {type source line 1361 file info.test cmd {uplevel \\#0 $script} proc ::tcltest::RunTest}} -cleanup {unset script y}
 
 test info-38.2 {location information for uplevel, dl, direct-literal} -match glob -body {
     join [lrange [uplevel \#0 {
@@ -1370,7 +1370,7 @@ test info-38.2 {location information for uplevel, dl, direct-literal} -match glo
     }] 0 2] \n
 } -result {* {type source line 728 file info.test cmd {info frame $level} proc ::etrace level 0}
 * {type source line 1369 file info.test cmd etrace proc ::tcltest::RunTest}
-* {type source line 1367 file info.test cmd uplevel\\ \\\\ proc ::tcltest::RunTest}}
+* {type source line 1367 file info.test cmd uplevel\\ \\\\ proc ::tcltest::RunTest}} -cleanup {unset y}
 
 test info-38.3 {location information for uplevel, dpv, direct-proc-var} -match glob -body {
     set script {
@@ -1381,7 +1381,7 @@ test info-38.3 {location information for uplevel, dpv, direct-proc-var} -match g
 } -result {* {type source line 728 file info.test cmd {info frame $level} proc ::etrace level 0}
 * {type eval line 3 cmd etrace proc ::control}
 * {type source line 1338 file info.test cmd {uplevel 1 $script} proc ::control}
-* {type source line 1380 file info.test cmd {control y $script} proc ::tcltest::RunTest}}
+* {type source line 1380 file info.test cmd {control y $script} proc ::tcltest::RunTest}} -cleanup {unset script y}
 
 test info-38.4 {location information for uplevel, dpv, direct-proc-literal} -match glob -body {
     join [lrange [control y {
@@ -1391,7 +1391,7 @@ test info-38.4 {location information for uplevel, dpv, direct-proc-literal} -mat
 } -result {* {type source line 728 file info.test cmd {info frame $level} proc ::etrace level 0}
 * {type source line 1389 file info.test cmd etrace proc ::control}
 * {type source line 1338 file info.test cmd {uplevel 1 $script} proc ::control}
-* {type source line 1387 file info.test cmd control proc ::tcltest::RunTest}}
+* {type source line 1387 file info.test cmd control proc ::tcltest::RunTest}} -cleanup {unset y}
 
 test info-38.5 {location information for uplevel, ppv, proc-proc-var} -match glob -body {
     join [lrange [datav] 0 4] \n
@@ -1431,14 +1431,14 @@ test info-39.0 {location information not confused by literal sharing} -body {
     set res [::foo::bar]
     namespace delete ::foo
     join $res \n
-} -result {
+} -cleanup {unset res} -result {
 type source line 1427 file info.test cmd {info frame 0} proc ::foo::bar level 0
 type source line 1428 file info.test cmd {info frame 0} proc ::foo::bar level 0}
 
 # -------------------------------------------------------------------------
 # Additional tests for info-30.*, handling of continuation lines (bs+nl sequences).
 
-test info-30.1 {bs+nl in literal words, procedure body, compiled} {
+test info-30.1 {bs+nl in literal words, procedure body, compiled} -body {
     proc abra {} {
 	if {1} \
 	    {
@@ -1446,34 +1446,34 @@ test info-30.1 {bs+nl in literal words, procedure body, compiled} {
 		    [reduce [info frame 0]];# line 1446
 	    }
     }
-    set res [abra]
+    abra
+} -cleanup {
     rename abra {}
-    set res
-} {type source line 1446 file info.test cmd {info frame 0} proc ::abra level 0}
+} -result {type source line 1446 file info.test cmd {info frame 0} proc ::abra level 0}
 
 test info-30.2 {bs+nl in literal words, namespace script} {
     namespace eval xxx {
-	set res \
+	variable res \
 	    [reduce [info frame 0]];# line 1457
     }
-    set res
+    return $xxx::res
 } {type source line 1457 file info.test cmd {info frame 0} level 0}
 
 test info-30.3 {bs+nl in literal words, namespace multi-word script} {
-    namespace eval xxx set res \
+    namespace eval xxx variable res \
 	[list [reduce [info frame 0]]];# line 1464
-    set res
+    return $xxx::res
 } {type source line 1464 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
 
-test info-30.4 {bs+nl in literal words, eval script} {
+test info-30.4 {bs+nl in literal words, eval script} -cleanup {unset res} -body {
     eval {
 	set ::res \
 	    [reduce [info frame 0]];# line 1471
     }
-    set res
-} {type source line 1471 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+    return $res
+} -result {type source line 1471 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
 
-test info-30.5 {bs+nl in literal words, eval script, with nested words} {
+test info-30.5 {bs+nl in literal words, eval script, with nested words} -body {
     eval {
 	if {1} \
 	    {
@@ -1481,58 +1481,58 @@ test info-30.5 {bs+nl in literal words, eval script, with nested words} {
 		    [reduce [info frame 0]];# line 1481
 	    }
     }
-    set res
-} {type source line 1481 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+    return $res
+} -cleanup {unset res} -result {type source line 1481 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
 
-test info-30.6 {bs+nl in computed word} {
+test info-30.6 {bs+nl in computed word} -cleanup {unset res} -body {
     set res "\
 [reduce [info frame 0]]";# line 1489
-} { type source line 1489 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+} -result { type source line 1489 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
 
-test info-30.7 {bs+nl in computed word, in proc} {
+test info-30.7 {bs+nl in computed word, in proc} -body {
     proc abra {} {
 	return "\
 [reduce [info frame 0]]";# line 1495
     }
-    set res [abra]
+    abra
+} -cleanup {
     rename abra {}
-    set res
-} { type source line 1495 file info.test cmd {info frame 0} proc ::abra level 0}
+} -result { type source line 1495 file info.test cmd {info frame 0} proc ::abra level 0}
 
-test info-30.8 {bs+nl in computed word, nested eval} {
+test info-30.8 {bs+nl in computed word, nested eval} -body {
     eval {
 	set \
 	    res "\
 [reduce [info frame 0]]";# line 1506
 }
-} { type source line 1506 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+} -cleanup {unset res} -result { type source line 1506 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
 
-test info-30.9 {bs+nl in computed word, nested eval} {
+test info-30.9 {bs+nl in computed word, nested eval} -body {
     eval {
 	set \
 	    res "\
 [reduce \
      [info frame 0]]";# line 1515
 }
-} { type source line 1515 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+} -cleanup {unset res} -result { type source line 1515 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
 
-test info-30.10 {bs+nl in computed word, key to array} {
+test info-30.10 {bs+nl in computed word, key to array} -body {
     set tmp([set \
 	    res "\
 [reduce \
      [info frame 0]]"]) x ; #1523
     unset tmp
     set res
-} { type source line 1523 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+} -cleanup {unset res} -result { type source line 1523 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
 
-test info-30.11 {bs+nl in subst arguments} {
+test info-30.11 {bs+nl in subst arguments} -body {
     subst {[set \
 	    res "\
 [reduce \
      [info frame 0]]"]} ; #1532
-} { type source line 1532 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+} -cleanup {unset res} -result { type source line 1532 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
 
-test info-30.12 {bs+nl in computed word, nested eval} {
+test info-30.12 {bs+nl in computed word, nested eval} -body {
     eval {
 	set \
 	    res "\
@@ -1540,9 +1540,9 @@ test info-30.12 {bs+nl in computed word, nested eval} {
 [reduce \
      [info frame 0]]";# line 1541
 }
-} {   type source line 1541 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+} -cleanup {unset res x} -result {   type source line 1541 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
 
-test info-30.13 {bs+nl in literal words, uplevel script, with nested words} {
+test info-30.13 {bs+nl in literal words, uplevel script, with nested words} -body {
     uplevel #0 {
 	if {1} \
 	    {
@@ -1550,8 +1550,8 @@ test info-30.13 {bs+nl in literal words, uplevel script, with nested words} {
 		    [reduce [info frame 0]];# line 1550
 	    }
     }
-    set res
-} {type source line 1550 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+    return $res
+} -cleanup {unset res} -result {type source line 1550 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
 
 test info-30.14 {bs+nl, literal word, uplevel through proc} {
     proc abra {script} {
@@ -1775,52 +1775,60 @@ test info-30.39 {TIP 280 for compiled [subst]} {
 [format %s {}]\
 [reduce [info frame 0]]} ; # 1776
 } {  type source line 1776 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
-test info-30.40 {TIP 280 for compiled [subst]} {
+test info-30.40 {TIP 280 for compiled [subst]} -setup {
     unset -nocomplain empty
+} -body {
     set empty {}
-    subst {$empty[reduce [info frame 0]]} ; # 1781
-} {type source line 1781 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
-test info-30.41 {TIP 280 for compiled [subst]} {
+    subst {$empty[reduce [info frame 0]]} ; # 1782
+} -cleanup {
+    unset empty
+} -result {type source line 1782 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+test info-30.41 {TIP 280 for compiled [subst]} -setup {
     unset -nocomplain empty
+} -body {
     set empty {}
     subst {$empty
-[reduce [info frame 0]]} ; # 1787
-} {
-type source line 1787 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
-test info-30.42 {TIP 280 for compiled [subst]} {
+[reduce [info frame 0]]} ; # 1791
+} -cleanup {
+    unset empty
+} -result {
+type source line 1791 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+test info-30.42 {TIP 280 for compiled [subst]} -setup {
     unset -nocomplain empty
-    set empty {}
-    subst {$empty\
-[reduce [info frame 0]]} ; # 1794
-} { type source line 1794 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
-test info-30.43 {TIP 280 for compiled [subst]} {
+} -body {
+    set empty {}; subst {$empty\
+[reduce [info frame 0]]} ; # 1800
+} -cleanup {
+    unset empty
+} -result { type source line 1800 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+test info-30.43 {TIP 280 for compiled [subst]} -body {
     unset -nocomplain a\nb
     set a\nb {}
     subst {${a
-b}[reduce [info frame 0]]} ; # 1800
-} {type source line 1800 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+b}[reduce [info frame 0]]} ; # 1808
+} -cleanup {unset a\nb} -result {type source line 1808 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
 test info-30.44 {TIP 280 for compiled [subst]} {
     unset -nocomplain a
     set a(\n) {}
     subst {$a(
-)[reduce [info frame 0]]} ; # 1806
-} {type source line 1806 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+)[reduce [info frame 0]]} ; # 1814
+} {type source line 1814 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
 test info-30.45 {TIP 280 for compiled [subst]} {
     unset -nocomplain a
     set a() {}
     subst {$a([
-return -level 0])[reduce [info frame 0]]} ; # 1812
-} {type source line 1812 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+return -level 0])[reduce [info frame 0]]} ; # 1820
+} {type source line 1820 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
 test info-30.46 {TIP 280 for compiled [subst]} {
     unset -nocomplain a
-    set a(1817) YES;  set a(1816) 1816; set a(1818) 1818
-    subst {$a([dict get [info frame 0] line])} ; # 1817
+    set a(1825) YES;  set a(1824) 1824; set a(1826) 1826
+    subst {$a([dict get [info frame 0] line])} ; # 1825
 } YES
 test info-30.47 {TIP 280 for compiled [subst]} {
     unset -nocomplain a
-    set a(\n1823) YES;  set a(\n1822) 1822; set a(\n1824) 1824 
+    set a(\n1831) YES;  set a(\n1830) 1830; set a(\n1832) 1832 
     subst {$a(
-[dict get [info frame 0] line])} ; # 1823
+[dict get [info frame 0] line])} ; # 1831
 } YES
 unset -nocomplain a
 
@@ -1828,8 +1836,9 @@ test info-30.48 {Bug 2850901} testevalex {
     testevalex {return -level 0 [format %s {}
 ][reduce [info frame 0]]} ; # line 2 of the eval
 } {type eval line 2 cmd {info frame 0} proc ::tcltest::RunTest}
-
+
 # -------------------------------------------------------------------------
+unset -nocomplain res
 
 # cleanup
 catch {namespace delete test_ns_info1 test_ns_info2}