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

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

diff --git a/t/io/pipe.t b/t/io/pipe.t
old mode 100755 (executable)
new mode 100644 (file)
index d411719..9c165a3
--- a/t/io/pipe.t
+++ b/t/io/pipe.t
@@ -10,7 +10,7 @@ BEGIN {
         skip_all("fork required to pipe");
     }
     else {
-        plan(tests => 22);
+        plan(tests => 24);
     }
 }
 
@@ -30,7 +30,7 @@ close PIPE;
 SKIP: {
     # Technically this should be TODO.  Someone try it if you happen to
     # have a vmesa machine.
-    skip "Doesn't work here yet", 4 if $^O eq 'vmesa';
+    skip "Doesn't work here yet", 6 if $^O eq 'vmesa';
 
     if (open(PIPE, "-|")) {
        while(<PIPE>) {
@@ -50,6 +50,49 @@ SKIP: {
     # This has to be *outside* the fork
     next_test() for 1..2;
 
+    my $raw = "abc\nrst\rxyz\r\nfoo\n";
+    if (open(PIPE, "-|")) {
+       $_ = join '', <PIPE>;
+       (my $raw1 = $_) =~ s/not ok \d+ - //;
+       my @r  = map ord, split //, $raw;
+       my @r1 = map ord, split //, $raw1;
+        if ($raw1 eq $raw) {
+           s/^not (ok \d+ -) .*/$1 '@r1' passes through '-|'\n/s;
+       } else {
+           s/^(not ok \d+ -) .*/$1 expect '@r', got '@r1'\n/s;
+       }
+       print;
+       close PIPE;        # avoid zombies
+    }
+    else {
+       printf STDOUT "not ok %d - $raw", curr_test();
+        exec $Perl, '-e0';     # Do not run END()...
+    }
+
+    # This has to be *outside* the fork
+    next_test();
+
+    if (open(PIPE, "|-")) {
+       printf PIPE "not ok %d - $raw", curr_test();
+       close PIPE;        # avoid zombies
+    }
+    else {
+       $_ = join '', <STDIN>;
+       (my $raw1 = $_) =~ s/not ok \d+ - //;
+       my @r  = map ord, split //, $raw;
+       my @r1 = map ord, split //, $raw1;
+        if ($raw1 eq $raw) {
+           s/^not (ok \d+ -) .*/$1 '@r1' passes through '|-'\n/s;
+       } else {
+           s/^(not ok \d+ -) .*/$1 expect '@r', got '@r1'\n/s;
+       }
+       print;
+        exec $Perl, '-e0';     # Do not run END()...
+    }
+
+    # This has to be *outside* the fork
+    next_test();
+
     SKIP: {
         skip "fork required", 2 unless $Config{d_fork};
 
@@ -109,12 +152,11 @@ SKIP: {
 
     SKIP: {
         # Sfio doesn't report failure when closing a broken pipe
-        # that has pending output.  Go figure.  MachTen doesn't either,
-        # but won't write to broken pipes, so nothing's pending at close.
+        # that has pending output.  Go figure.
         # BeOS will not write to broken pipes, either.
         # Nor does POSIX-BC.
         skip "Won't report failure on broken pipe", 1
-          if $Config{d_sfio} || $^O eq 'machten' || $^O eq 'beos' || 
+          if $Config{d_sfio} || $^O eq 'beos' ||
              $^O eq 'posix-bc';
 
         local $SIG{PIPE} = 'IGNORE';