Merge 8.6

3 files changed, 25 insertions, 28 deletions

diff --git a/tests/init.test b/tests/init.test
index a241c0b..91df4a1 100644
--- a/tests/init.test
+++ b/tests/init.test
@@ -19,16 +19,16 @@ if {"::tcltest" ni [namespace children]} {
 catch {namespace delete {*}[namespace children :: test_ns_*]}
 
 test init-0.1 {no error on initialization phase (init.tcl)} -setup {
-    interp create slave
+    interp create child
 } -body {
-    slave eval {
+    child eval {
 	list [set v [info exists ::errorInfo]] \
 		[if {$v} {set ::errorInfo}] \
 	     [set v [info exists ::errorCode]] \
 		[if {$v} {set ::errorCode}]
     }
 } -cleanup {
-    interp delete slave
+    interp delete child
 } -result {0 {} 0 {}}
 
 # Six cases - white box testing
@@ -59,11 +59,11 @@ test init-1.8 {auto_qualify - multiple colons 2} {
     auto_qualify :::foo ::bar
 } foo
 
-# We use a sub-interp and auto_reset and double the tests because there is 2
+# We use a child interp and auto_reset and double the tests because there is 2
 # places where auto_loading occur (before loading the indexes files and after)
 
 set testInterp [interp create]
-tcltest::loadIntoSlaveInterpreter $testInterp {*}$argv
+tcltest::loadIntoChildInterpreter $testInterp {*}$argv
 interp eval $testInterp {
     namespace import -force ::tcltest::*
     customMatch pairwise {apply {{mode pair} {
diff --git a/tests/io.test b/tests/io.test
index 96add20..a723e29 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -6783,7 +6783,7 @@ test io-49.5 {testing crlf reading, leftover cr disgorgment} {
     set l
 } [list 7 a\rb\rc 7 {} 7 1]
 
-test io-50.1 {testing handler deletion} {testchannelevent} {
+test io-50.1 {testing handler deletion} {testchannelevent nonPortable} {
     file delete $path(test1)
     set f [open $path(test1) w]
     close $f
@@ -6799,7 +6799,7 @@ test io-50.1 {testing handler deletion} {testchannelevent} {
     close $f
     set z
 } called
-test io-50.2 {testing handler deletion with multiple handlers} {testchannelevent} {
+test io-50.2 {testing handler deletion with multiple handlers} {testchannelevent nonPortable} {
     file delete $path(test1)
     set f [open $path(test1) w]
     close $f
@@ -6817,7 +6817,7 @@ test io-50.2 {testing handler deletion with multiple handlers} {testchannelevent
     string compare [string tolower $z] \
 	[list [list called delhandler $f 0] [list called delhandler $f 1]]
 } 0
-test io-50.3 {testing handler deletion with multiple handlers} {testchannelevent} {
+test io-50.3 {testing handler deletion with multiple handlers} {testchannelevent nonPortable} {
     file delete $path(test1)
     set f [open $path(test1) w]
     close $f
@@ -6843,7 +6843,7 @@ test io-50.3 {testing handler deletion with multiple handlers} {testchannelevent
 	[list [list delhandler $f 0 called] \
 	      [list delhandler $f 0 deleted myself]]
 } 0
-test io-50.4 {testing handler deletion vs reentrant calls} {testchannelevent} {
+test io-50.4 {testing handler deletion vs reentrant calls} {testchannelevent nonPortable} {
     file delete $path(test1)
     set f [open $path(test1) w]
     close $f
@@ -6865,10 +6865,9 @@ test io-50.4 {testing handler deletion vs reentrant calls} {testchannelevent} {
     variable z ""
     update
     close $f
-    string compare [string tolower $z] \
-	{{delrecursive calling recursive} {delrecursive deleting recursive}}
-} 0
-test io-50.5 {testing handler deletion vs reentrant calls} {testchannelevent} {
+    set z
+} {{delrecursive calling recursive} {delrecursive deleting recursive}}
+test io-50.5 {testing handler deletion vs reentrant calls} {testchannelevent nonPortable} {
     file delete $path(test1)
     set f [open $path(test1) w]
     close $f
@@ -6898,11 +6897,10 @@ test io-50.5 {testing handler deletion vs reentrant calls} {testchannelevent} {
     set u toplevel
     update
     close $f
-    string compare [string tolower $z] \
-	[list {del calling recursive} {del deleted notcalled} \
-	      {del deleted myself} {del after update}]
-} 0
-test io-50.6 {testing handler deletion vs reentrant calls} {testchannelevent} {
+    set z	
+} [list {del calling recursive} {del deleted notcalled} \
+	{del deleted myself} {del after update}]
+test io-50.6 {testing handler deletion vs reentrant calls} {testchannelevent nonPortable} {
     file delete $path(test1)
     set f [open $path(test1) w]
     close $f
@@ -6940,11 +6938,10 @@ test io-50.6 {testing handler deletion vs reentrant calls} {testchannelevent} {
     set u toplevel
     update
     close $f
-    string compare [string tolower $z] \
-	[list {first called} {first called not toplevel} \
-	      {second called, first time} {second called, second time} \
-	      {first after update}]
-} 0
+    set z
+} [list {first called} {first called not toplevel} \
+	{second called, first time} {second called, second time} \
+	{first after update}]
 
 test io-51.1 {Test old socket deletion on Macintosh} {socket} {
     set x 0
diff --git a/tests/package.test b/tests/package.test
index 2dca06b..e12dd30 100644
--- a/tests/package.test
+++ b/tests/package.test
@@ -20,9 +20,9 @@ if {"::tcltest" ni [namespace children]} {
 ::tcltest::loadTestedCommands
 catch [list package require -exact Tcltest [info patchlevel]]
 
-# Do all this in a slave interp to avoid garbaging the package list
+# Do all this in a child interp to avoid garbaging the package list
 set i [interp create]
-tcltest::loadIntoSlaveInterpreter $i {*}$argv
+tcltest::loadIntoChildInterpreter $i {*}$argv
 catch [list load {} Tcltest $i]
 interp eval $i {
 namespace import -force ::tcltest::*
@@ -945,15 +945,15 @@ test package-4.56 {Tcl_PackageCmd procedure, "vsatisfies" option} -body {
 # No tests for FindPackage; can't think up anything detectable errors.
 
 test package-5.1 {TclFreePackageInfo procedure} {
-    interp create slave
-    slave eval {
+    interp create child
+    child eval {
 	package ifneeded t 2.3 x
 	package ifneeded t 2.4 y
 	package ifneeded x 3.1 z
 	package provide q 4.3
 	package unknown "will this get freed?"
     }
-    interp delete slave
+    interp delete child
 } {}
 test package-5.2 {TclFreePackageInfo procedure} -body {
     interp create foo