merge trunk

1 files changed, 9 insertions, 3 deletions

diff --git a/tests/io.test b/tests/io.test
index e6cea16..f3c39f4 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -2086,6 +2086,8 @@ set path(pipe)   [makeFile {} pipe]
 set path(output) [makeFile {} output]
 test io-27.6 {FlushChannel, async flushing, async close} \
 	{stdio asyncPipeClose openpipe} {
+    # This test may fail on old Unix systems (seen on IRIX64 6.5) with
+    # obsolete gettimeofday() calls.  See Tcl Bugs 3530533, 1942197.
     file delete $path(pipe)
     file delete $path(output)
     set f [open $path(pipe) w]
@@ -2645,6 +2647,8 @@ test io-29.30 {Tcl_WriteChars, crlf mode} {
     file size $path(test1)
 } 25
 test io-29.31 {Tcl_WriteChars, background flush} {stdio openpipe} {
+    # This test may fail on old Unix systems (seen on IRIX64 6.5) with
+    # obsolete gettimeofday() calls.  See Tcl Bugs 3530533, 1942197.
     file delete $path(pipe)
     file delete $path(output)
     set f [open $path(pipe) w]
@@ -2686,6 +2690,8 @@ test io-29.31 {Tcl_WriteChars, background flush} {stdio openpipe} {
 } ok
 test io-29.32 {Tcl_WriteChars, background flush to slow reader} \
 	{stdio asyncPipeClose openpipe} {
+    # This test may fail on old Unix systems (seen on IRIX64 6.5) with
+    # obsolete gettimeofday() calls.  See Tcl Bugs 3530533, 1942197.
     file delete $path(pipe)
     file delete $path(output)
     set f [open $path(pipe) w]
@@ -2748,13 +2754,13 @@ test io-29.33b {TIP#398, no implicit flush of nonblocking on exit} {exec} {
     set f [open $path(script2) w]
     puts $f {after 2000}
     close $f
-	set t1 [clock seconds]
+	set t1 [clock milliseconds]
 	set ff [open "|[list [interpreter] $path(script2)]" w]
 	catch {unset ::env(TCL_FLUSH_NONBLOCKING_ON_EXIT)}
 	exec [interpreter] $path(script) >@ $ff
-	set t2 [clock seconds]
+	set t2 [clock milliseconds]
 	close $ff
-	expr {($t2-$t1)/2}
+	expr {($t2-$t1)/2000 ? $t2-$t1 : 0}
 } 0
 test io-29.34 {Tcl_Close, async flush on close, using sockets} {socket tempNotMac fileevent} {
     variable c 0