Merge 8.7

1 files changed, 11 insertions, 0 deletions

diff --git a/tests/assemble.test b/tests/assemble.test
index d4e44f8..0a7631a 100644
--- a/tests/assemble.test
+++ b/tests/assemble.test
@@ -141,6 +141,7 @@ test assemble-3.1 {wrong # args, compiled path} {
     -returnCodes error
     -match glob
     -result {wrong # args:*}
+    -cleanup {rename x {}}
 }
 test assemble-3.2 {wrong # args, compiled path} {
     -body {
@@ -235,6 +236,7 @@ test assemble-5.3 {unsupported substitution} {
 	list [catch {x} result] $result $::errorCode
     }
     -result {1 {assembly code may not contain substitutions} {TCL ASSEM NOSUBST}}
+    -cleanup {rename x {}}
 }
 test assemble-5.4 {backslash substitution} {
     -body {
@@ -622,6 +624,7 @@ test assemble-7.24 {lsetList} {
 	x
     }
     -result {{a b} {c d} {e i} {g h}}
+    -cleanup {rename x {}}
 }
 test assemble-7.25 {lshift} {
     -body {
@@ -3093,6 +3096,7 @@ test assemble-41.1 {Inconsistent stack usage} {*}{
     -match glob
     -result {inconsistent stack depths on two execution paths
     ("assemble" body, line 10)*}
+    -cleanup {rename x {}}
 }
 test assemble-41.2 {Inconsistent stack, jumptable and default} {
     -body {
@@ -3111,6 +3115,7 @@ test assemble-41.2 {Inconsistent stack, jumptable and default} {
     -match glob
     -result {inconsistent stack depths on two execution paths
     ("assemble" body, line 6)*}
+    -cleanup {rename x {}}
 }
 test assemble-41.3 {Inconsistent stack, two legs of jumptable} {
     -body {
@@ -3130,6 +3135,7 @@ test assemble-41.3 {Inconsistent stack, two legs of jumptable} {
     -match glob
     -result {inconsistent stack depths on two execution paths
     ("assemble" body, line 7)*}
+    -cleanup {rename x {}}
 }
 
 test assemble-50.1 {Ulam's 3n+1 problem, TAL implementation} {
@@ -3182,6 +3188,7 @@ test assemble-50.1 {Ulam's 3n+1 problem, TAL implementation} {
 	set result
     }
     -result {1 2 16 4 16 16 52 8 52 16 52 16 40 52 160 16 52 52 88 20 64 52 160 24 88 40 9232 52 88}
+    -cleanup {rename ulam {}}
 }
 
 test assemble-51.1 {memory leak testing} memory {
@@ -3337,6 +3344,10 @@ test assemble-52.1 {Bug 3154ea2759} {
 
 rename fillTables {}
 rename assemble {}
+if {[testConstraint memory]} {
+    rename getbytes {}
+    rename leaktest {}
+}
 
 ::tcltest::cleanupTests
 return