diff options
author | Craig A. Berry <craigberry@mac.com> | 2008-08-13 03:10:16 +0000 |
---|---|---|
committer | Craig A. Berry <craigberry@mac.com> | 2008-08-13 03:10:16 +0000 |
commit | 7aa55bb4d7409fae441c5fde09543172f4df350d (patch) | |
tree | be6bd72e3c40c861db6e51217da720aecf11be8c /t/io | |
parent | 2811b8367c43e9764f1551138ba9713a2c0f557a (diff) | |
download | perl-7aa55bb4d7409fae441c5fde09543172f4df350d.tar.gz |
VMS-specific follow-up to tempfile name changes in 34182, plus
a TODO in dup.t that's long since to-done.
p4raw-id: //depot/perl@34203
Diffstat (limited to 't/io')
-rwxr-xr-x | t/io/dup.t | 18 | ||||
-rwxr-xr-x | t/io/fs.t | 2 |
2 files changed, 7 insertions, 13 deletions
diff --git a/t/io/dup.t b/t/io/dup.t index 18277d9e8d..ac2f3f465d 100755 --- a/t/io/dup.t +++ b/t/io/dup.t @@ -38,19 +38,12 @@ $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. -if( $^O eq 'VMS' ) { - print "not ok $_ # TODO system() not honoring STDOUT redirect on VMS\n" - for 6..7; +system sprintf $echo, 6; +if ($^O eq 'MacOS') { + system sprintf $echo, 7; } else { - system sprintf $echo, 6; - if ($^O eq 'MacOS') { - system sprintf $echo, 7; - } - else { - system sprintf "$echo 1>&2", 7; - } + system sprintf "$echo 1>&2", 7; } close(STDOUT) or die "Could not close: $!"; @@ -59,7 +52,8 @@ close(STDERR) or die "Could not close: $!"; 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 $tempfile` } +if (($^O eq 'MSWin32') || ($^O eq 'NetWare')) { print `type $tempfile` } +elsif ($^O eq 'VMS') { system "type $tempfile.;" } # TYPE defaults to .LIS when there is no extension elsif ($^O eq 'MacOS') { system "catenate $tempfile" } else { system "cat $tempfile" } @@ -437,7 +437,7 @@ SKIP: { if ($^O eq 'VMS') { # must have delete access to rename a directory `set file $tmpdir.dir/protection=o:d`; - ok(rename('$tmpdir.dir', '$tmpdir1.dir'), "rename on directories") || + ok(rename("$tmpdir.dir", "$tmpdir1.dir"), "rename on directories") || print "# errno: $!\n"; } else { |