Merge 8.7

5 files changed, 11 insertions, 4 deletions

diff --git a/tests/append.test b/tests/append.test
index 7d895b7..0708fc5 100644
--- a/tests/append.test
+++ b/tests/append.test
@@ -15,6 +15,7 @@ if {"::tcltest" ni [namespace children]} {
     package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
+::tcltest::loadTestedCommands
 unset -nocomplain x
 
 test append-1.1 {append command} {
@@ -65,15 +66,15 @@ test append-3.6 {append surrogates} -body {
     set x \uDE02
     set x \uD83D$x
 } -result \uD83D\uDE02
-test append-3.7 {append \xC0 \x80} -body {
+test append-3.7 {append \xC0 \x80} -constraints testbytestring -body {
     set x [testbytestring \xC0]
     string length [append x [testbytestring \x80]]
 } -result 2
-test append-3.8 {append \xC0 \x80} -body {
+test append-3.8 {append \xC0 \x80} -constraints testbytestring -body {
     set x [testbytestring \xC0]
     string length $x[testbytestring \x80]
 } -result 2
-test append-3.9 {append \xC0 \x80} -body {
+test append-3.9 {append \xC0 \x80} -constraints testbytestring -body {
     set x [testbytestring \x80]
     string length [testbytestring \xC0]$x
 } -result 2
diff --git a/tests/binary.test b/tests/binary.test
index 36e31ce..a43fb49 100644
--- a/tests/binary.test
+++ b/tests/binary.test
@@ -14,6 +14,9 @@ if {"::tcltest" ni [namespace children]} {
     package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
+::tcltest::loadTestedCommands
+catch [list package require -exact tcl::test [info patchlevel]]
+
 testConstraint bigEndian [expr {$tcl_platform(byteOrder) eq "bigEndian"}]
 testConstraint littleEndian [expr {$tcl_platform(byteOrder) eq "littleEndian"}]
 testConstraint testbytestring [llength [info commands testbytestring]]
diff --git a/tests/proc.test b/tests/proc.test
index 23aea28..ab32567 100644
--- a/tests/proc.test
+++ b/tests/proc.test
@@ -17,6 +17,7 @@ if {"::tcltest" ni [namespace children]} {
     package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
+::tcltest::loadTestedCommands
 
 testConstraint tcl::test [expr {![catch {package require tcl::test}]}]
 testConstraint memory	    [llength [info commands memory]]
diff --git a/tests/safe.test b/tests/safe.test
index f3a6565..773b16f 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -24,6 +24,8 @@ if {"::tcltest" ni [namespace children]} {
     package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
+::tcltest::loadTestedCommands
+catch [list package require -exact tcl::test [info patchlevel]]
 
 foreach i [interp children] {
     interp delete $i
diff --git a/unix/tclKqueueNotfy.c b/unix/tclKqueueNotfy.c
index 7cacde2..ab3732d 100644
--- a/unix/tclKqueueNotfy.c
+++ b/unix/tclKqueueNotfy.c
@@ -528,7 +528,7 @@ TclpCreateFileHandler(
     filePtr->mask = mask;
 
     PlatformEventsControl(filePtr, tsdPtr, EV_ADD, isNew);
-}    
+}
 
 /*
  *----------------------------------------------------------------------