Resolve test conflicts over global vars

2 files changed, 11 insertions, 4 deletions

diff --git a/tests/utf.test b/tests/utf.test
index 2fcac49..83daddf 100644
--- a/tests/utf.test
+++ b/tests/utf.test
@@ -287,9 +287,11 @@ test utf-18.5 {Tcl_UniCharToTitle, no delta} {
     string totitle !
 } !
 
-test utf-19.1 {TclUniCharLen} {
+test utf-19.1 {TclUniCharLen} -body {
     list [regexp \\d abc456def foo] $foo
-} {1 4}
+} -cleanup {
+    unset -nocomplain foo
+} -result {1 4}
 
 test utf-20.1 {TclUniCharNcmp} {
 } {}
diff --git a/tests/var.test b/tests/var.test
index a7950be..7ff394e 100644
--- a/tests/var.test
+++ b/tests/var.test
@@ -865,14 +865,19 @@ test var-20.8 {array set compilation correctness: Bug 3603163} -setup {
     }}
     array size x
 } -result 0
-test var-20.9 {[bc1a96407a] array set compiled w/ trace} {
+test var-20.9 {[bc1a96407a] array set compiled w/ trace} -setup {
     variable foo
+    variable lambda
+    unset -nocomplain lambda foo
+    array set foo {}
     lappend lambda {}
     lappend lambda [list array set [namespace which -variable foo] {a 1}]
+} -body {
     after 0 [list apply $lambda]
     vwait [namespace which -variable foo]
+} -cleanup {
     unset -nocomplain lambda foo
-} {}
+} -result {}
 test var-20.10 {[bc1a96407a] array set don't compile bad varname} -body {
     apply {{} {set name foo(bar); array set $name {a 1}}}
 } -returnCodes error -match glob -result *