Merge 8.6. Mark testcase utf-4.11 as "knownBug": this one still doesn't give the right answer. Add testcase 4.14 with similar corner-case, this one is OK.

1 files changed, 112 insertions, 100 deletions

diff --git a/tests/utf.test b/tests/utf.test
index a7a99de..64d3ffb 100644
--- a/tests/utf.test
+++ b/tests/utf.test
@@ -104,24 +104,18 @@ test utf-2.6 {Tcl_UtfToUniChar: lead (3-byte) followed by 1 trail} testbytestrin
 test utf-2.7 {Tcl_UtfToUniChar: lead (3-byte) followed by 2 trail} testbytestring {
     string length [testbytestring \xE4\xB9\x8E]
 } 1
-test utf-2.8.0 {Tcl_UtfToUniChar: lead (4-byte) followed by 3 trail} {testbytestring ucs2} {
+test utf-2.8.0 {Tcl_UtfToUniChar: lead (4-byte) followed by 3 trail} {testbytestring ucs2_utf16} {
     string length [testbytestring \xF0\x90\x80\x80]
-} 4
+} 2
 test utf-2.8.1 {Tcl_UtfToUniChar: lead (4-byte) followed by 3 trail} {testbytestring ucs4} {
     string length [testbytestring \xF0\x90\x80\x80]
 } 1
-test utf-2.8.2 {Tcl_UtfToUniChar: lead (4-byte) followed by 3 trail} {testbytestring utf16} {
-    string length [testbytestring \xF0\x90\x80\x80]
-} 2
-test utf-2.9.0 {Tcl_UtfToUniChar: lead (4-byte) followed by 3 trail} {testbytestring ucs2} {
+test utf-2.9.0 {Tcl_UtfToUniChar: lead (4-byte) followed by 3 trail} {testbytestring ucs2_utf16} {
     string length [testbytestring \xF4\x8F\xBF\xBF]
-} 4
+} 2
 test utf-2.9.1 {Tcl_UtfToUniChar: lead (4-byte) followed by 3 trail} {Uesc ucs4} {
     string length \U10FFFF
 } 1
-test utf-2.9.2 {Tcl_UtfToUniChar: lead (4-byte) followed by 3 trail} utf16 {
-    string length \uDBFF\uDFFF
-} 2
 test utf-2.10 {Tcl_UtfToUniChar: lead (4-byte) followed by 3 trail, underflow} testbytestring {
     string length [testbytestring \xF0\x8F\xBF\xBF]
 } 4
@@ -167,21 +161,21 @@ test utf-4.9 {Tcl_NumUtfChars: #u20AC, calc len, incomplete} {testnumutfchars te
 test utf-4.10 {Tcl_NumUtfChars: #x00, calc len, overcomplete} {testnumutfchars testbytestring} {
     testnumutfchars [testbytestring \x00] end+1
 } 2
-test utf-4.11 {Tcl_NumUtfChars: 3 bytes of 4-byte UTF-8 characater} {testnumutfchars testbytestring} {
+test utf-4.11 {Tcl_NumUtfChars: 3 bytes of 4-byte UTF-8 characater} {testnumutfchars testbytestring knownBug} {
     testnumutfchars [testbytestring \xF0\x9F\x92\xA9] end-1
 } 3
-test utf-4.12.0 {Tcl_NumUtfChars: #4-byte UTF-8 character} {testnumutfchars testbytestring ucs2} {
+test utf-4.12.0 {Tcl_NumUtfChars: #4-byte UTF-8 character} {testnumutfchars testbytestring ucs2_utf16} {
     testnumutfchars [testbytestring \xF0\x9F\x92\xA9] end
-} 4
+} 2
 test utf-4.12.1 {Tcl_NumUtfChars: #4-byte UTF-8 character} {testnumutfchars testbytestring ucs4} {
     testnumutfchars [testbytestring \xF0\x9F\x92\xA9] end
 } 1
-test utf-4.12.2 {Tcl_NumUtfChars: #4-byte UTF-8 character} {testnumutfchars testbytestring utf16} {
-    testnumutfchars [testbytestring \xF0\x9F\x92\xA9] end
-} 2
-test utf-4.13 {Tcl_NumUtfChars: end of string} {testnumutfchars testbytestring} { 
+test utf-4.13 {Tcl_NumUtfChars: end of string} {testnumutfchars testbytestring} {
     testnumutfchars foobar[testbytestring \xF2\xC2\xA0] end
 } 8
+test utf-4.14 {Tcl_NumUtfChars: 3 bytes of 4-byte UTF-8 characater} {testnumutfchars testbytestring} {
+    testnumutfchars [testbytestring \xF4\x90\x80\x80] end-1
+} 3
 
 test utf-5.1 {Tcl_UtfFindFirst} {testfindfirst testbytestring} {
     testfindfirst [testbytestring abcbc] 98
@@ -194,7 +188,7 @@ test utf-6.1 {Tcl_UtfNext} testutfnext {
     # This takes the pointer one past the terminating NUL.
     # This is really an invalid call.
     testutfnext {}
-} 1
+} -1
 test utf-6.2 {Tcl_UtfNext} testutfnext {
     testutfnext A
 } 1
@@ -216,9 +210,12 @@ test utf-6.7 {Tcl_UtfNext} {testutfnext testbytestring} {
 test utf-6.8 {Tcl_UtfNext} {testutfnext testbytestring} {
     testutfnext A[testbytestring \xF8]
 } 1
-test utf-6.9 {Tcl_UtfNext} {testutfnext testbytestring} {
+test utf-6.9.0 {Tcl_UtfNext} {testutfnext testbytestring ucs2} {
     testutfnext [testbytestring \xA0]
 } 1
+test utf-6.9.1 {Tcl_UtfNext} {testutfnext testbytestring fullutf} {
+    testutfnext [testbytestring \xA0]
+} -1
 test utf-6.10 {Tcl_UtfNext} {testutfnext testbytestring} {
     testutfnext [testbytestring \xA0]G
 } 1
@@ -260,7 +257,7 @@ test utf-6.22 {Tcl_UtfNext} {testutfnext testbytestring} {
 } 1
 test utf-6.23 {Tcl_UtfNext} {testutfnext testbytestring} {
     testutfnext [testbytestring \xE8]
-} 1
+} -1
 test utf-6.24 {Tcl_UtfNext} {testutfnext testbytestring} {
     testutfnext [testbytestring \xE8]G
 } 1
@@ -279,15 +276,21 @@ test utf-6.28 {Tcl_UtfNext} {testutfnext testbytestring} {
 test utf-6.29 {Tcl_UtfNext} {testutfnext testbytestring} {
     testutfnext [testbytestring \xE8\xF8]
 } 1
-test utf-6.30 {Tcl_UtfNext} {testutfnext testbytestring} {
+test utf-6.30.0 {Tcl_UtfNext} {testutfnext testbytestring ucs2_utf16} {
     testutfnext [testbytestring \xF2]
 } 1
+test utf-6.30.1 {Tcl_UtfNext} {testutfnext testbytestring ucs4} {
+    testutfnext [testbytestring \xF2]
+} -1
 test utf-6.31 {Tcl_UtfNext} {testutfnext testbytestring} {
     testutfnext [testbytestring \xF2]G
 } 1
-test utf-6.32 {Tcl_UtfNext} {testutfnext testbytestring} {
+test utf-6.32.0 {Tcl_UtfNext} {testutfnext testbytestring ucs2_utf16} {
     testutfnext [testbytestring \xF2\xA0]
 } 1
+test utf-6.32.1 {Tcl_UtfNext} {testutfnext testbytestring ucs4} {
+    testutfnext [testbytestring \xF2\xA0]
+} -1
 test utf-6.33 {Tcl_UtfNext} {testutfnext testbytestring} {
     testutfnext [testbytestring \xF2\xD0]
 } 1
@@ -483,44 +486,53 @@ test utf-6.88 {Tcl_UtfNext, pointing to 2th byte of 3-byte valid sequence} {test
 test utf-6.89 {Tcl_UtfNext, pointing to 2th byte of 3-byte invalid sequence} {testutfnext testbytestring} {
     testutfnext [testbytestring \x80\x80\x00]
 } 1
-test utf-6.90.0 {Tcl_UtfNext, validity check [493dccc2de]} {testutfnext ucs2_utf16} {
+test utf-6.90.0 {Tcl_UtfNext, validity check [493dccc2de]} {testutfnext testbytestring ucs2_utf16} {
     testutfnext [testbytestring \xF4\x8F\xBF\xBF]
 } 1
-test utf-6.90.1 {Tcl_UtfNext, validity check [493dccc2de]} {testutfnext ucs4} {
+test utf-6.90.1 {Tcl_UtfNext, validity check [493dccc2de]} {testutfnext testbytestring ucs4} {
     testutfnext [testbytestring \xF4\x8F\xBF\xBF]
 } 4
-test utf-6.91 {Tcl_UtfNext, validity check [493dccc2de]} {testutfnext testbytestring} {
+test utf-6.91.0 {Tcl_UtfNext, validity check [493dccc2de]} {testutfnext testbytestring ucs2} {
+    testutfnext [testbytestring \xF4\x90\x80\x80]
+} 1
+test utf-6.91.1 {Tcl_UtfNext, validity check [493dccc2de]} {testutfnext testbytestring fullutf} {
     testutfnext [testbytestring \xF4\x90\x80\x80]
 } 1
-test utf-6.92 {Tcl_UtfNext, pointing to 2th byte of 4-byte valid sequence} {testutfnext testbytestring} {
+test utf-6.92.0 {Tcl_UtfNext, pointing to 2th byte of 4-byte valid sequence} {testutfnext testbytestring ucs2} {
+    testutfnext [testbytestring \xA0\xA0\xA0]
+} 1
+test utf-6.92.1 {Tcl_UtfNext, pointing to 2th byte of 4-byte valid sequence} {testutfnext testbytestring fullutf} {
     testutfnext [testbytestring \xA0\xA0\xA0]
 } 3
-test utf-6.93 {Tcl_UtfNext, pointing to 2th byte of 4-byte invalid sequence} {testutfnext testbytestring} {
+test utf-6.93.0 {Tcl_UtfNext, pointing to 2th byte of 4-byte invalid sequence} {testutfnext testbytestring ucs2} {
+    testutfnext [testbytestring \x80\x80\x80]
+} 1
+test utf-6.93.1 {Tcl_UtfNext, pointing to 2th byte of 4-byte invalid sequence} {testutfnext testbytestring fullutf} {
     testutfnext [testbytestring \x80\x80\x80]
 } 3
-test utf-6.94 {Tcl_UtfNext, pointing to 2th byte of 5-byte invalid sequence} {testutfnext testbytestring} {
+test utf-6.94 {Tcl_UtfNext, pointing to 2th byte of 5-byte invalid sequence} {testutfnext testbytestring ucs2} {
     testutfnext [testbytestring \xA0\xA0\xA0\xA0]
-} 3
-test utf-6.95 {Tcl_UtfNext, pointing to 2th byte of 5-byte invalid sequence} {testutfnext testbytestring} {
+} 1
+test utf-6.95 {Tcl_UtfNext, pointing to 2th byte of 5-byte invalid sequence} {testutfnext testbytestring ucs2} {
     testutfnext [testbytestring \x80\x80\x80\x80]
-} 3
-test utf-6.96 {Tcl_UtfNext, read limits} {testutfnext testbytestring} {
-    testutfnext [testbytestring G] 0
+} 1
+test utf-6.96 {Tcl_UtfNext, read limits} testutfnext {
+    testutfnext G 0
 } 0
 test utf-6.97 {Tcl_UtfNext, read limits} {testutfnext testbytestring} {
     testutfnext [testbytestring \xA0] 0
 } 0
-test utf-6.98 {Tcl_UtfNext, read limits} {testutfnext testbytestring} {
-    testutfnext A[testbytestring G] 1
+test utf-6.98 {Tcl_UtfNext, read limits} testutfnext {
+    testutfnext AG 1
 } 1
 test utf-6.99 {Tcl_UtfNext, read limits} {testutfnext testbytestring} {
     testutfnext A[testbytestring \xA0] 1
 } 1
 test utf-6.100 {Tcl_UtfNext, read limits} {testutfnext testbytestring} {
-    testutfnext [testbytestring \xD0\xA0G] 1
+    testutfnext [testbytestring \xD0\xA0]G 1
 } 0
 test utf-6.101 {Tcl_UtfNext, read limits} {testutfnext testbytestring} {
-    testutfnext [testbytestring \xD0\xA0G] 2
+    testutfnext [testbytestring \xD0\xA0]G 2
 } 2
 test utf-6.102 {Tcl_UtfNext, read limits} {testutfnext testbytestring} {
     testutfnext [testbytestring \xD0\xA0\xA0] 1
@@ -528,58 +540,58 @@ test utf-6.102 {Tcl_UtfNext, read limits} {testutfnext testbytestring} {
 test utf-6.103 {Tcl_UtfNext, read limits} {testutfnext testbytestring} {
     testutfnext [testbytestring \xD0\xA0\xA0] 2
 } 2
-test utf-6.104 {Tcl_UtfNext, read limits} {testutfnext testbytestring} {
-    testutfnext [testbytestring \xE8\xA0\xA0G] 1
+test utf-6.104 {Tcl_UtfNext, read limits} testutfnext {
+    testutfnext \u8820G 1
 } 0
-test utf-6.105 {Tcl_UtfNext, read limits} {testutfnext testbytestring} {
-    testutfnext [testbytestring \xE8\xA0\xA0G] 2
+test utf-6.105 {Tcl_UtfNext, read limits} testutfnext {
+    testutfnext \u8820G 2
 } 0
-test utf-6.106 {Tcl_UtfNext, read limits} {testutfnext testbytestring} {
-    testutfnext [testbytestring \xE8\xA0\xA0G] 3
+test utf-6.106 {Tcl_UtfNext, read limits} testutfnext {
+    testutfnext \u8820G 3
 } 3
 test utf-6.107 {Tcl_UtfNext, read limits} {testutfnext testbytestring} {
-    testutfnext [testbytestring \xE8\xA0\xA0\xA0] 1
+    testutfnext \u8820[testbytestring \xA0] 1
 } 0
 test utf-6.108 {Tcl_UtfNext, read limits} {testutfnext testbytestring} {
-    testutfnext [testbytestring \xE8\xA0\xA0\xA0] 2
+    testutfnext \u8820[testbytestring \xA0] 2
 } 0
 test utf-6.109 {Tcl_UtfNext, read limits} {testutfnext testbytestring} {
-    testutfnext [testbytestring \xE8\xA0\xA0\xA0] 3
+    testutfnext \u8820[testbytestring \xA0] 3
 } 3
-test utf-6.110.0 {Tcl_UtfNext, read limits} {testutfnext testbytestring ucs2_utf16} {
-    testutfnext [testbytestring \xF2\xA0\xA0\xA0G] 1
+test utf-6.110.0 {Tcl_UtfNext, read limits} {testutfnext testbytestring ucs2} {
+    testutfnext [testbytestring \xF2\xA0\xA0\xA0]G 1
 } 1
-test utf-6.110.1 {Tcl_UtfNext, read limits} {testutfnext testbytestring ucs4} {
-    testutfnext [testbytestring \xF2\xA0\xA0\xA0G] 1
+test utf-6.110.1 {Tcl_UtfNext, read limits} {testutfnext testbytestring fullutf} {
+    testutfnext [testbytestring \xF2\xA0\xA0\xA0]G 1
 } 0
-test utf-6.111.0 {Tcl_UtfNext, read limits} {testutfnext testbytestring ucs2_utf16} {
-    testutfnext [testbytestring \xF2\xA0\xA0\xA0G] 2
+test utf-6.111.0 {Tcl_UtfNext, read limits} {testutfnext testbytestring ucs2} {
+    testutfnext [testbytestring \xF2\xA0\xA0\xA0]G 2
 } 1
 test utf-6.111.1 {Tcl_UtfNext, read limits} {testutfnext testbytestring ucs4} {
-    testutfnext [testbytestring \xF2\xA0\xA0\xA0G] 2
+    testutfnext [testbytestring \xF2\xA0\xA0\xA0]G 2
 } 0
 test utf-6.112.0 {Tcl_UtfNext, read limits} {testutfnext testbytestring ucs2_utf16} {
-    testutfnext [testbytestring \xF2\xA0\xA0\xA0G] 3
+    testutfnext [testbytestring \xF2\xA0\xA0\xA0]G 3
 } 1
 test utf-6.112.1 {Tcl_UtfNext, read limits} {testutfnext testbytestring ucs4} {
-    testutfnext [testbytestring \xF2\xA0\xA0\xA0G] 3
+    testutfnext [testbytestring \xF2\xA0\xA0\xA0]G 3
 } 0
 test utf-6.113.0 {Tcl_UtfNext, read limits} {testutfnext testbytestring ucs2_utf16} {
-    testutfnext [testbytestring \xF2\xA0\xA0\xA0G] 4
+    testutfnext [testbytestring \xF2\xA0\xA0\xA0]G 4
 } 1
 test utf-6.113.1 {Tcl_UtfNext, read limits} {testutfnext testbytestring ucs4} {
-    testutfnext [testbytestring \xF2\xA0\xA0\xA0G] 4
+    testutfnext [testbytestring \xF2\xA0\xA0\xA0]G 4
 } 4
-test utf-6.114.0 {Tcl_UtfNext, read limits} {testutfnext testbytestring ucs2_utf16} {
+test utf-6.114.0 {Tcl_UtfNext, read limits} {testutfnext testbytestring ucs2} {
     testutfnext [testbytestring \xF2\xA0\xA0\xA0\xA0] 1
 } 1
-test utf-6.114.1 {Tcl_UtfNext, read limits} {testutfnext testbytestring ucs4} {
+test utf-6.114.1 {Tcl_UtfNext, read limits} {testutfnext testbytestring fullutf} {
     testutfnext [testbytestring \xF2\xA0\xA0\xA0\xA0] 1
 } 0
-test utf-6.115.0 {Tcl_UtfNext, read limits} {testutfnext testbytestring ucs2_utf16} {
+test utf-6.115.0 {Tcl_UtfNext, read limits} {testutfnext testbytestring ucs2} {
     testutfnext [testbytestring \xF2\xA0\xA0\xA0\xA0] 2
 } 1
-test utf-6.115.1 {Tcl_UtfNext, read limits} {testutfnext testbytestring ucs4} {
+test utf-6.115.1 {Tcl_UtfNext, read limits} {testutfnext testbytestring fullutf} {
     testutfnext [testbytestring \xF2\xA0\xA0\xA0\xA0] 2
 } 0
 test utf-6.116.0 {Tcl_UtfNext, read limits} {testutfnext testbytestring ucs2_utf16} {
@@ -595,32 +607,32 @@ test utf-6.117.1 {Tcl_UtfNext, read limits} {testutfnext testbytestring ucs4} {
     testutfnext [testbytestring \xF2\xA0\xA0\xA0\xA0] 4
 } 4
 test utf-6.118 {Tcl_UtfNext, read limits} {testutfnext testbytestring} {
-    testutfnext [testbytestring \xA0G] 0
+    testutfnext [testbytestring \xA0]G 0
 } 0
 test utf-6.119 {Tcl_UtfNext, read limits} {testutfnext testbytestring ucs2} {
-    testutfnext [testbytestring \xA0G] 1
-} 0
+    testutfnext [testbytestring \xA0]G 1
+} 1
 test utf-6.120 {Tcl_UtfNext, read limits} {testutfnext testbytestring ucs2} {
     testutfnext [testbytestring \xA0\xA0] 1
-} 0
+} 1
 test utf-6.121 {Tcl_UtfNext, read limits} {testutfnext testbytestring ucs2} {
-    testutfnext [testbytestring \xA0\xA0G] 2
-} 0
+    testutfnext [testbytestring \xA0\xA0]G 2
+} 1
 test utf-6.122 {Tcl_UtfNext, read limits} {testutfnext testbytestring ucs2} {
     testutfnext [testbytestring \xA0\xA0\xA0] 2
-} 0
+} 1
 test utf-6.123 {Tcl_UtfNext, read limits} {testutfnext testbytestring ucs2} {
-    testutfnext [testbytestring \xA0\xA0\xA0G] 3
-} 3
+    testutfnext [testbytestring \xA0\xA0\xA0]G 3
+} 1
 test utf-6.124 {Tcl_UtfNext, read limits} {testutfnext testbytestring ucs2} {
     testutfnext [testbytestring \xA0\xA0\xA0\xA0] 3
-} 3
+} 1
 test utf-6.125 {Tcl_UtfNext, read limits} {testutfnext testbytestring ucs2} {
-    testutfnext [testbytestring \xA0\xA0\xA0\xA0G] 4
-} 3
+    testutfnext [testbytestring \xA0\xA0\xA0\xA0]G 4
+} 1
 test utf-6.126 {Tcl_UtfNext, read limits} {testutfnext testbytestring ucs2} {
     testutfnext [testbytestring \xA0\xA0\xA0\xA0\xA0] 4
-} 3
+} 1
 
 test utf-7.1 {Tcl_UtfPrev} testutfprev {
     testutfprev {}
@@ -685,22 +697,22 @@ test utf-7.9.1 {Tcl_UtfPrev} {testutfprev testbytestring} {
 test utf-7.9.2 {Tcl_UtfPrev} {testutfprev testbytestring} {
     testutfprev A[testbytestring \xF8\xA0\xF8\xA0] 3
 } 2
-test utf-7.10.0 {Tcl_UtfPrev} {testutfprev testbytestring ucs2_utf16} {
+test utf-7.10.0 {Tcl_UtfPrev} {testutfprev testbytestring ucs2} {
     testutfprev A[testbytestring \xF2\xA0]
 } 2
-test utf-7.10.1 {Tcl_UtfPrev} {testutfprev testbytestring ucs4} {
+test utf-7.10.1 {Tcl_UtfPrev} {testutfprev testbytestring fullutf} {
     testutfprev A[testbytestring \xF2\xA0]
 } 1
-test utf-7.10.2 {Tcl_UtfPrev} {testutfprev testbytestring ucs2_utf16} {
+test utf-7.10.2 {Tcl_UtfPrev} {testutfprev testbytestring ucs2} {
     testutfprev A[testbytestring \xF2\xA0\xA0\xA0] 3
 } 2
-test utf-7.10.3 {Tcl_UtfPrev} {testutfprev testbytestring ucs4} {
+test utf-7.10.3 {Tcl_UtfPrev} {testutfprev testbytestring fullutf} {
     testutfprev A[testbytestring \xF2\xA0\xA0\xA0] 3
 } 1
-test utf-7.10.4 {Tcl_UtfPrev} {testutfprev testbytestring ucs2_utf16} {
+test utf-7.10.4 {Tcl_UtfPrev} {testutfprev testbytestring ucs2} {
     testutfprev A[testbytestring \xF2\xA0\xF8\xA0] 3
 } 2
-test utf-7.10.5 {Tcl_UtfPrev} {testutfprev testbytestring ucs4} {
+test utf-7.10.5 {Tcl_UtfPrev} {testutfprev testbytestring fullutf} {
     testutfprev A[testbytestring \xF2\xA0\xF8\xA0] 3
 } 1
 test utf-7.11 {Tcl_UtfPrev} {testutfprev testbytestring} {
@@ -742,22 +754,22 @@ test utf-7.14.1 {Tcl_UtfPrev} {testutfprev testbytestring} {
 test utf-7.14.2 {Tcl_UtfPrev} {testutfprev testbytestring} {
     testutfprev A[testbytestring \xF8\xA0\xA0\xF8] 4
 } 3
-test utf-7.15.0 {Tcl_UtfPrev} {testutfprev testbytestring ucs2_utf16} {
+test utf-7.15.0 {Tcl_UtfPrev} {testutfprev testbytestring ucs2} {
     testutfprev A[testbytestring \xF2\xA0\xA0]
 } 3
-test utf-7.15.1 {Tcl_UtfPrev} {testutfprev testbytestring ucs4} {
+test utf-7.15.1 {Tcl_UtfPrev} {testutfprev testbytestring fullutf} {
     testutfprev A[testbytestring \xF2\xA0\xA0]
 } 1
-test utf-7.15.1.0 {Tcl_UtfPrev} {testutfprev testbytestring ucs2_utf16} {
+test utf-7.15.2 {Tcl_UtfPrev} {testutfprev testbytestring ucs2} {
     testutfprev A[testbytestring \xF2\xA0\xA0\xA0] 4
 } 3
-test utf-7.15.1.1 {Tcl_UtfPrev} {testutfprev testbytestring ucs4} {
+test utf-7.15.3 {Tcl_UtfPrev} {testutfprev testbytestring fullutf} {
     testutfprev A[testbytestring \xF2\xA0\xA0\xA0] 4
 } 1
-test utf-7.15.2.0 {Tcl_UtfPrev} {testutfprev testbytestring ucs2_utf16} {
+test utf-7.15.4 {Tcl_UtfPrev} {testutfprev testbytestring ucs2} {
     testutfprev A[testbytestring \xF2\xA0\xA0\xF8] 4
 } 3
-test utf-7.15.2.1 {Tcl_UtfPrev} {testutfprev testbytestring ucs4} {
+test utf-7.15.5 {Tcl_UtfPrev} {testutfprev testbytestring fullutf} {
     testutfprev A[testbytestring \xF2\xA0\xA0\xF8] 4
 } 1
 test utf-7.16 {Tcl_UtfPrev} testutfprev {
@@ -862,7 +874,7 @@ test utf-7.31 {Tcl_UtfPrev -- overlong sequence}  {testutfprev testbytestring} {
 test utf-7.32 {Tcl_UtfPrev -- overlong sequence}  {testutfprev testbytestring} {
     testutfprev A[testbytestring \xF0\x80\x80\x80] 2
 } 1
-test utf-7.33 {Tcl_UtfPrev -- overlong sequence}  {testutfprev} {
+test utf-7.33 {Tcl_UtfPrev -- overlong sequence}  testutfprev {
     testutfprev A\x00
 } 1
 test utf-7.34 {Tcl_UtfPrev -- overlong sequence}  {testutfprev testbytestring} {
@@ -886,28 +898,28 @@ test utf-7.39.0 {Tcl_UtfPrev -- overlong sequence}  {testutfprev testbytestring
 test utf-7.39.1 {Tcl_UtfPrev -- overlong sequence}  {testutfprev testbytestring ucs4} {
     testutfprev A[testbytestring \xF0\x90\x80\x80]
 } 1
-test utf-7.40.0 {Tcl_UtfPrev -- overlong sequence}  {testutfprev testbytestring ucs2_utf16} {
+test utf-7.40.0 {Tcl_UtfPrev -- overlong sequence}  {testutfprev testbytestring ucs2} {
     testutfprev A[testbytestring \xF0\x90\x80\x80] 4
 } 3
-test utf-7.40.1 {Tcl_UtfPrev -- overlong sequence}  {testutfprev testbytestring ucs4} {
+test utf-7.40.1 {Tcl_UtfPrev -- overlong sequence}  {testutfprev testbytestring fullutf} {
     testutfprev A[testbytestring \xF0\x90\x80\x80] 4
 } 1
-test utf-7.41.0 {Tcl_UtfPrev -- overlong sequence}  {testutfprev testbytestring ucs2_utf16} {
+test utf-7.41.0 {Tcl_UtfPrev -- overlong sequence}  {testutfprev testbytestring ucs2} {
     testutfprev A[testbytestring \xF0\x90\x80\x80] 3
 } 2
-test utf-7.41.1 {Tcl_UtfPrev -- overlong sequence}  {testutfprev testbytestring ucs4} {
+test utf-7.41.1 {Tcl_UtfPrev -- overlong sequence}  {testutfprev testbytestring fullutf} {
     testutfprev A[testbytestring \xF0\x90\x80\x80] 3
 } 1
-test utf-7.42 {Tcl_UtfPrev -- overlong sequence}  testutfprev {
+test utf-7.42 {Tcl_UtfPrev -- overlong sequence}  {testutfprev testbytestring} {
     testutfprev A[testbytestring \xF0\x90\x80\x80] 2
 } 1
-test utf-7.43 {Tcl_UtfPrev -- no lead byte at start}  testutfprev {
+test utf-7.43 {Tcl_UtfPrev -- no lead byte at start}  {testutfprev testbytestring} {
     testutfprev [testbytestring \xA0]
 } 0
-test utf-7.44 {Tcl_UtfPrev -- no lead byte at start}  testutfprev {
+test utf-7.44 {Tcl_UtfPrev -- no lead byte at start}  {testutfprev testbytestring} {
     testutfprev [testbytestring \xA0\xA0]
 } 1
-test utf-7.45 {Tcl_UtfPrev -- no lead byte at start}  testutfprev {
+test utf-7.45 {Tcl_UtfPrev -- no lead byte at start}  {testutfprev testbytestring} {
     testutfprev [testbytestring \xA0\xA0\xA0]
 } 2
 test utf-7.46.0 {Tcl_UtfPrev -- no lead byte at start}  {testutfprev testbytestring ucs2_utf16} {
@@ -931,16 +943,16 @@ test utf-7.48.0 {Tcl_UtfPrev, validity check [493dccc2de]} {testutfprev testbyte
 test utf-7.48.1 {Tcl_UtfPrev, validity check [493dccc2de]} {testutfprev testbytestring ucs4} {
     testutfprev A[testbytestring \xF4\x8F\xBF\xBF]
 } 1
-test utf-7.48.2 {Tcl_UtfPrev, validity check [493dccc2de]} {testutfprev testbytestring ucs2_utf16} {
+test utf-7.48.2 {Tcl_UtfPrev, validity check [493dccc2de]} {testutfprev testbytestring ucs2} {
     testutfprev A[testbytestring \xF4\x8F\xBF\xBF] 4
 } 3
-test utf-7.48.3 {Tcl_UtfPrev, validity check [493dccc2de]} {testutfprev testbytestring ucs4} {
+test utf-7.48.3 {Tcl_UtfPrev, validity check [493dccc2de]} {testutfprev testbytestring fullutf} {
     testutfprev A[testbytestring \xF4\x8F\xBF\xBF] 4
 } 1
-test utf-7.48.4 {Tcl_UtfPrev, validity check [493dccc2de]} {testutfprev testbytestring ucs2_utf16} {
+test utf-7.48.4 {Tcl_UtfPrev, validity check [493dccc2de]} {testutfprev testbytestring ucs2} {
     testutfprev A[testbytestring \xF4\x8F\xBF\xBF] 3
 } 2
-test utf-7.48.5 {Tcl_UtfPrev, validity check [493dccc2de]} {testutfprev testbytestring ucs4} {
+test utf-7.48.5 {Tcl_UtfPrev, validity check [493dccc2de]} {testutfprev testbytestring fullutf} {
     testutfprev A[testbytestring \xF4\x8F\xBF\xBF] 3
 } 1
 test utf-7.48.6 {Tcl_UtfPrev, validity check [493dccc2de]} {testutfprev testbytestring} {
@@ -1464,7 +1476,7 @@ UniCharCaseCmpTest > \U10000 \uFFFF		{Uesc ucs4}
 
 test utf-26.1 {Tcl_UniCharDString} -setup {
     testobj freeallvars
-} -constraints {teststringobj} -cleanup {
+} -constraints {teststringobj testbytestring} -cleanup {
     testobj freeallvars
 } -body {
     teststringobj set 1 foo