X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fio%2Fdup.t;h=6e7d1218485a2345c6579a2a9ee75b7d8c467e4e;hb=6bb58485551f8d4b76e9d80d26347173bb9571e8;hp=96fe3bedeb197829210cf61b730861884a76ad44;hpb=cda41bc103281f18855c0da8ed14366b1358eda9;p=p5sagit%2Fp5-mst-13.2.git diff --git a/t/io/dup.t b/t/io/dup.t index 96fe3be..6e7d121 100755 --- a/t/io/dup.t +++ b/t/io/dup.t @@ -22,12 +22,13 @@ print STDOUT "ok 2\n"; print STDERR "ok 3\n"; # Since some systems don't have echo, we use Perl. -$echo = qq{$^X -le "print q{ok %d}"}; +$echo = qq{$^X -le "print q(ok %d)"}; -$cmd = sprintf $echo, 4; +$cmd = sprintf $echo, 4; print `$cmd`; -$cmd = sprintf "$echo 1>&2", 5; +$cmd = sprintf "$echo 1>&2", 5; +$cmd = sprintf $echo, 5 if $^O eq 'MacOS'; # don't know if we can do this ... print `$cmd`; # KNOWN BUG system() does not honor STDOUT redirections on VMS. @@ -37,17 +38,23 @@ if( $^O eq 'VMS' ) { } else { system sprintf $echo, 6; - system sprintf "$echo 1>&2", 7; + if ($^O eq 'MacOS') { + system sprintf $echo, 7; + } + else { + system sprintf "$echo 1>&2", 7; + } } -close(STDOUT); -close(STDERR); +close(STDOUT) or die "Could not close: $!"; +close(STDERR) or die "Could not close: $!"; -open(STDOUT,">&DUPOUT"); -open(STDERR,">&DUPERR"); +open(STDOUT,">&DUPOUT") or die "Could not open: $!"; +open(STDERR,">&DUPERR") or die "Could not open: $!"; if (($^O eq 'MSWin32') || ($^O eq 'NetWare') || ($^O eq 'VMS')) { print `type Io.dup` } -else { system 'cat Io.dup' } +elsif ($^O eq 'MacOS') { system 'catenate Io.dup' } +else { system 'cat Io.dup' } unlink 'Io.dup'; print STDOUT "ok 8\n";