merge trunk

2 files changed, 4 insertions, 0 deletions

diff --git a/tests/io.test b/tests/io.test
index 74a246c..e6cea16 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -2750,6 +2750,7 @@ test io-29.33b {TIP#398, no implicit flush of nonblocking on exit} {exec} {
     close $f
 	set t1 [clock seconds]
 	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]
 	close $ff
diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index 4c08229..6b1da73 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -2575,6 +2575,7 @@ test iocmd.tf-24.15 {chan write, EAGAIN means that writing is not allowed at thi
     set res
 } -cleanup {
     proc foo {args} {onfinal; set ::done-24.15 1; return 3}
+    after 1000 {set ::done-24.15 2}
     vwait done-24.15
     rename foo {}
     unset res
@@ -2603,10 +2604,12 @@ test iocmd.tf-24.16 {chan write, note the background flush setup by close due to
     proc foo {args} { onfinal; note BG ; track ; set ::endbody-24.16 1}
     # Flush (sic!) the event-queue to capture the write from a
     # BG-flush.
+    after 1000 {set ::endbody-24.16 2}
     vwait endbody-24.16
     set res
 } -cleanup {
     proc foo {args} {onfinal; set ::done-24.16 1; return 3}
+    after 1000 {set ::done-24.16 2}
     vwait done-24.16
     rename foo {}
     unset res