Merge 8.7. First working version, feature complete

1 files changed, 14 insertions, 14 deletions

diff --git a/tests/stringObj.test b/tests/stringObj.test
index abe02b2..bae61ab 100644
--- a/tests/stringObj.test
+++ b/tests/stringObj.test
@@ -57,26 +57,26 @@ test stringObj-3.2 {Tcl_SetStringObj, existing non-"empty string" object} testob
     lappend result [testobj refcount 1]
 } {{} 512 foo string 2}
 
-test stringObj-4.1 {Tcl_SetObjLength procedure, string gets shorter} testobj {
+test stringObj-4.1 {Tcl_SetObjLength procedure, string gets shorter} {testobj fullutf} {
     testobj freeallvars
     teststringobj set 1 test
     teststringobj setlength 1 3
     list [teststringobj length 1] [teststringobj length2 1] \
 	    [teststringobj get 1]
-} {3 4 tes}
+} {3 3 tes}
 test stringObj-4.2 {Tcl_SetObjLength procedure, string gets longer} testobj {
     testobj freeallvars
     teststringobj set 1 abcdef
     teststringobj setlength 1 10
     list [teststringobj length 1] [teststringobj length2 1]
 } {10 10}
-test stringObj-4.3 {Tcl_SetObjLength procedure, string gets longer} testobj {
+test stringObj-4.3 {Tcl_SetObjLength procedure, string gets longer} {testobj fullutf} {
     testobj freeallvars
     teststringobj set 1 abcdef
     teststringobj append 1 xyzq -1
     list [teststringobj length 1] [teststringobj length2 1] \
 	    [teststringobj get 1]
-} {10 20 abcdefxyzq}
+} {10 10 abcdefxyzq}
 test stringObj-4.4 {Tcl_SetObjLength procedure, "expty string", length 0} testobj {
     testobj freeallvars
     testobj newobj 1
@@ -97,7 +97,7 @@ test stringObj-5.2 {Tcl_AppendToObj procedure, length calculation} testobj {
     teststringobj append 1 123 -1
     teststringobj get 1
 } {x y bbCC123}
-test stringObj-5.3 {Tcl_AppendToObj procedure, reallocating space} testobj {
+test stringObj-5.3 {Tcl_AppendToObj procedure, reallocating space} {testobj fullutf} {
     testobj freeallvars
     teststringobj set 1 xyz
     teststringobj setlength 1 15
@@ -109,7 +109,7 @@ test stringObj-5.3 {Tcl_AppendToObj procedure, reallocating space} testobj {
     teststringobj append 1 abcdef -1
     lappend result [teststringobj length 1] [teststringobj length2 1] \
 	    [teststringobj get 1]
-} {15 15 16 32 xy12345678abcdef}
+} {15 15 16 16 xy12345678abcdef}
 
 test stringObj-6.1 {Tcl_AppendStringsToObj procedure, type conversion} testobj {
     testobj freeallvars
@@ -135,12 +135,12 @@ test stringObj-6.4 {Tcl_AppendStringsToObj procedure, counting space} testobj {
     teststringobj appendstrings 1 { 123 } abcdefg
     list [teststringobj length 1] [teststringobj get 1]
 } {15 {abc 123 abcdefg}}
-test stringObj-6.5 {Tcl_AppendStringsToObj procedure, don't double space if initial string empty} testobj {
+test stringObj-6.5 {Tcl_AppendStringsToObj procedure, don't double space if initial string empty} {testobj fullutf} {
     testobj freeallvars
     testobj newobj 1
     teststringobj appendstrings 1 123 abcdefg
     list [teststringobj length 1] [teststringobj length2 1] [teststringobj get 1]
-} {10 20 123abcdefg}
+} {10 10 123abcdefg}
 test stringObj-6.6 {Tcl_AppendStringsToObj procedure, space reallocation} testobj {
     testobj freeallvars
     teststringobj set 1 abc
@@ -150,7 +150,7 @@ test stringObj-6.6 {Tcl_AppendStringsToObj procedure, space reallocation} testob
     list [teststringobj length 1] [teststringobj length2 1] \
 	    [teststringobj get 1]
 } {10 10 ab34567890}
-test stringObj-6.7 {Tcl_AppendStringsToObj procedure, space reallocation} testobj {
+test stringObj-6.7 {Tcl_AppendStringsToObj procedure, space reallocation} {testobj fullutf} {
     testobj freeallvars
     teststringobj set 1 abc
     teststringobj setlength 1 10
@@ -158,7 +158,7 @@ test stringObj-6.7 {Tcl_AppendStringsToObj procedure, space reallocation} testob
     teststringobj appendstrings 1 34567890x
     list [teststringobj length 1] [teststringobj length2 1] \
 	    [teststringobj get 1]
-} {11 22 ab34567890x}
+} {11 11 ab34567890x}
 test stringObj-6.8 {Tcl_AppendStringsToObj procedure, object totally empty} testobj {
     testobj freeallvars
     testobj newobj 1
@@ -172,13 +172,13 @@ test stringObj-6.9 {Tcl_AppendStringToObj, pure unicode} testobj {
     teststringobj get 1
 } adcfoobarsoom
 
-test stringObj-7.1 {SetStringFromAny procedure} testobj {
+test stringObj-7.1 {SetStringFromAny procedure} {testobj fullutf} {
     testobj freeallvars
     teststringobj set2 1 [list a b]
     teststringobj append 1 x -1
     list [teststringobj length 1] [teststringobj length2 1] \
 	    [teststringobj get 1]
-} {4 8 {a bx}}
+} {4 4 {a bx}}
 test stringObj-7.2 {SetStringFromAny procedure, null object} testobj {
     testobj freeallvars
     testobj newobj 1
@@ -197,7 +197,7 @@ test stringObj-7.4 {SetStringFromAny called with string obj} testobj {
 	    [string length $x] [testobj objtype $x]
 } {6 string 6 string}
 
-test stringObj-8.1 {DupStringInternalRep procedure} testobj {
+test stringObj-8.1 {DupStringInternalRep procedure} {testobj fullutf} {
     testobj freeallvars
     teststringobj set 1 {}
     teststringobj append 1 abcde -1
@@ -206,7 +206,7 @@ test stringObj-8.1 {DupStringInternalRep procedure} testobj {
 	    [teststringobj maxchars 1] [teststringobj get 1] \
 	    [teststringobj length 2] [teststringobj length2 2] \
 	    [teststringobj maxchars 2] [teststringobj get 2]
-} {5 10 0 abcde 5 5 0 abcde}
+} {5 5 5 abcde 5 5 5 abcde}
 test stringObj-8.2 {DupUnicodeInternalRep, mixed width chars} testobj {
     set x abc\xEF\xBF\xAEghi
     string length $x