Put a watchdog on openpid.t: it has been found to hang in some Win32 smokes.

[p5sagit/p5-mst-13.2.git] / t / io / openpid.t

diff --git a/t/io/openpid.t b/t/io/openpid.t
old mode 100755 (executable)
new mode 100644 (file)
index 2dec677..ee4702c
--- a/t/io/openpid.t
+++ b/t/io/openpid.t
@@ -13,18 +13,20 @@ BEGIN {
     require './test.pl';
 }
 
-if ($^O eq 'dos' || $^O eq 'MacOS') {
+if ($^O eq 'dos') {
     skip_all("no multitasking");
 }
 
 plan tests => 10;
-
+watchdog(15);
 
 use Config;
 $| = 1;
 $SIG{PIPE} = 'IGNORE';
+$SIG{HUP} = 'IGNORE' if $^O eq 'interix';
 
 my $perl = which_perl();
+$perl .= qq[ "-I../lib"];
 
 #
 # commands run 4 perl programs.  Two of these programs write a
@@ -33,22 +35,21 @@ my $perl = which_perl();
 # the other reader reads one line, waits a few seconds and then
 # exits to test the waitpid function.
 #
-@cmd1 = ($perl,'-I../lib','-e',
-        q{$|=1; print qq[first process\n]; sleep 300;});
-@cmd2 = ($perl,'-I../lib','-e',
-        q{$|=1; print qq[second process\n]; sleep 30;});
-@cmd3 = ($perl,'-I../lib','-e',
-        "print <>;"); # hangs waiting for end of STDIN
-@cmd4 = ($perl,'-I../lib','-e',
-        "print scalar <>;");
+$cmd1 = qq/$perl -e "\$|=1; print qq[first process\\n]; sleep 30;"/;
+$cmd2 = qq/$perl -e "\$|=1; print qq[second process\\n]; sleep 30;"/;
+$cmd3 = qq/$perl -e "print <>;"/; # hangs waiting for end of STDIN
+$cmd4 = qq/$perl -e "print scalar <>;"/;
 
 #warn "#$cmd1\n#$cmd2\n#$cmd3\n#$cmd4\n";
 
 # start the processes
-ok( $pid1 = open(FH1, "-|", @cmd1), 'first process started');
-ok( $pid2 = open(FH2, "-|", @cmd2), '    second' );
-ok( $pid3 = open(FH3, "|-", @cmd3), '    third'  );
-ok( $pid4 = open(FH4, "|-", @cmd4), '    fourth' );
+ok( $pid1 = open(FH1, "$cmd1 |"), 'first process started');
+ok( $pid2 = open(FH2, "$cmd2 |"), '    second' );
+{
+    no warnings 'once';
+    ok( $pid3 = open(FH3, "| $cmd3"), '    third'  );
+}
+ok( $pid4 = open(FH4, "| $cmd4"), '    fourth' );
 
 print "# pids were $pid1, $pid2, $pid3, $pid4\n";