Make sure all uses of the [testbytestring] command are constrained.

4 files changed, 32 insertions, 30 deletions

diff --git a/tests/parse.test b/tests/parse.test
index fe6026d..4e3139c 100644
--- a/tests/parse.test
+++ b/tests/parse.test
@@ -303,8 +303,10 @@ test parse-6.16 {ParseTokens procedure, backslash substitution} testparser {
     testparser {\n\a\x7f} 0
 } {- {\n\a\x7f} 1 word {\n\a\x7f} 3 backslash {\n} 0 backslash {\a} 0 backslash {\x7f} 0 {}}
 test parse-6.17 {ParseTokens procedure, null characters} {testparser testbytestring} {
-    testparser [testbytestring "foo\0zz"] 0
-} "- [testbytestring foo\0zz] 1 word [testbytestring foo\0zz] 3 text foo 0 text [testbytestring \0] 0 text zz 0 {}"
+    expr {[testparser [testbytestring "foo\0zz"] 0] eq
+"- [testbytestring foo\0zz] 1 word [testbytestring foo\0zz] 3 text foo 0 text [testbytestring \0] 0 text zz 0 {}"
+	}
+} 1
 test parse-6.18 {ParseTokens procedure, seek past numBytes for close-bracket} testparser {
     # Test for Bug 681841
     list [catch {testparser {[a]} 2} msg] $msg
diff --git a/tests/parseOld.test b/tests/parseOld.test
index 4c08b5d..a6e07a2b 100644
--- a/tests/parseOld.test
+++ b/tests/parseOld.test
@@ -263,14 +263,14 @@ test parseOld-7.11 {backslash substitution} {
     eval "list a \"b c\"\\\nd e"
 } {a {b c} d e}
 test parseOld-7.12 {backslash substitution} testbytestring {
-    list \ua2
-} [testbytestring "\xc2\xa2"]
+    expr {[list \ua2] eq [testbytestring "\xc2\xa2"]}
+} 1
 test parseOld-7.13 {backslash substitution} testbytestring {
-    list \u4e21
-} [testbytestring "\xe4\xb8\xa1"]
+    expr {[list \u4e21] eq [testbytestring "\xe4\xb8\xa1"]}
+} 1
 test parseOld-7.14 {backslash substitution} testbytestring {
-    list \u4e2k
-} [testbytestring "\xd3\xa2k"]
+    expr {[list \u4e2k] eq [testbytestring "\xd3\xa2k"]}
+} 1
 
 # Semi-colon.
 
diff --git a/tests/subst.test b/tests/subst.test
index 256b7f7..2115772 100644
--- a/tests/subst.test
+++ b/tests/subst.test
@@ -38,8 +38,8 @@ test subst-2.3 {simple strings} {
 } abcdefg
 test subst-2.4 {simple strings} testbytestring {
     # Tcl Bug 685106
-    subst [testbytestring bar\x00soom]
-} [testbytestring bar\x00soom]
+    expr {[subst [testbytestring bar\x00soom]] eq [testbytestring bar\x00soom]}
+} 1
 
 test subst-3.1 {backslash substitutions} {
     subst {\x\$x\[foo bar]\\}
diff --git a/tests/utf.test b/tests/utf.test
index 83daddf..ceb1af7 100644
--- a/tests/utf.test
+++ b/tests/utf.test
@@ -21,23 +21,23 @@ testConstraint testbytestring [llength [info commands testbytestring]]
 catch {unset x}
 
 test utf-1.1 {Tcl_UniCharToUtf: 1 byte sequences} testbytestring {
-    set x \x01
-} [testbytestring "\x01"]
+    expr {"\x01" eq [testbytestring "\x01"]}
+} 1
 test utf-1.2 {Tcl_UniCharToUtf: 2 byte sequences} testbytestring {
-    set x "\x00"
-} [testbytestring "\xc0\x80"]
+    expr {"\x00" eq [testbytestring "\xc0\x80"]}
+} 1
 test utf-1.3 {Tcl_UniCharToUtf: 2 byte sequences} testbytestring {
-    set x "\xe0"
-} [testbytestring "\xc3\xa0"]
+    expr {"\xe0" eq [testbytestring "\xc3\xa0"]}
+} 1
 test utf-1.4 {Tcl_UniCharToUtf: 3 byte sequences} testbytestring {
-    set x "\u4e4e"
-} [testbytestring "\xe4\xb9\x8e"]
+    expr {"\u4e4e" eq [testbytestring "\xe4\xb9\x8e"]}
+} 1
 test utf-1.5 {Tcl_UniCharToUtf: overflowed Tcl_UniChar} testbytestring {
-    format %c 0x110000
-} [testbytestring "\xef\xbf\xbd"]
+    expr {[format %c 0x110000] eq [testbytestring "\xef\xbf\xbd"]}
+} 1
 test utf-1.6 {Tcl_UniCharToUtf: negative Tcl_UniChar} testbytestring {
-    format %c -1
-} [testbytestring "\xef\xbf\xbd"]
+    expr {[format %c -1] eq [testbytestring "\xef\xbf\xbd"]}
+} 1
 
 test utf-2.1 {Tcl_UtfToUniChar: low ascii} {
     string length "abc"
@@ -128,17 +128,17 @@ test utf-10.1 {Tcl_UtfBackslash: dst == NULL} {
 } {
 }
 test utf-10.2 {Tcl_UtfBackslash: \u subst} testbytestring {
-    set x \ua2
-} [testbytestring "\xc2\xa2"]
+    expr {"\ua2" eq [testbytestring "\xc2\xa2"]}
+} 1
 test utf-10.3 {Tcl_UtfBackslash: longer \u subst} testbytestring {
-    set x \u4e21
-} [testbytestring "\xe4\xb8\xa1"]
+    expr {"\u4e21" eq [testbytestring "\xe4\xb8\xa1"]}
+} 1
 test utf-10.4 {Tcl_UtfBackslash: stops at first non-hex} testbytestring {
-    set x \u4e2k
-} "[testbytestring \xd3\xa2]k"
+    expr {"\u4e2k" eq "[testbytestring \xd3\xa2]k"}
+} 1
 test utf-10.5 {Tcl_UtfBackslash: stops after 4 hex chars} testbytestring {
-    set x \u4e216
-} "[testbytestring \xe4\xb8\xa1]6"
+    expr {"\u4e216" eq "[testbytestring \xe4\xb8\xa1]6"}
+} 1
 proc bsCheck {char num} {
     global errNum
     test utf-10.$errNum {backslash substitution} {