Integrate mainline changes into win32 branch. Now would be a good time

to reverse integrate the win32 branch into mainline.

p4raw-id: //depot/win32/perl@253

3 files changed, 5 insertions, 4 deletions

diff --git a/t/io/pipe.t b/t/io/pipe.t
index ac149810ec..efeda80551 100755
--- a/t/io/pipe.t
+++ b/t/io/pipe.t
@@ -62,7 +62,7 @@ sub broken_pipe {
 
 print WRITER "not ok 7\n";
 close WRITER;
-
+sleep 1;
 print "ok 8\n";
 
 # VMS doesn't like spawning subprocesses that are still connected to
diff --git a/t/lib/io_pipe.t b/t/lib/io_pipe.t
index eee374149c..e1c48b6a7e 100755
--- a/t/lib/io_pipe.t
+++ b/t/lib/io_pipe.t
@@ -104,6 +104,7 @@ sub broken_pipe {
 print $pipe "not ok 9\n";
 $pipe->close;
 
+sleep 1;
 
 print "ok 10\n";
 
diff --git a/t/op/magic.t b/t/op/magic.t
index bddcd27679..e48b71cd68 100755
--- a/t/op/magic.t
+++ b/t/op/magic.t
@@ -46,9 +46,9 @@ else {
 
     $| = 1;		# command buffering
 
-    $SIG{"INT"} = "ok3";     kill "INT",$$;
-    $SIG{"INT"} = "IGNORE";  kill "INT",$$; print "ok 4\n";
-    $SIG{"INT"} = "DEFAULT"; kill "INT",$$; print "not ok\n";
+    $SIG{"INT"} = "ok3";     kill "INT",$$; sleep 1;
+    $SIG{"INT"} = "IGNORE";  kill "INT",$$; sleep 1; print "ok 4\n";
+    $SIG{"INT"} = "DEFAULT"; kill "INT",$$; sleep 1; print "not ok\n";
 
     sub ok3 {
 	if (($x = pop(@_)) eq "INT") {