Change 34203 by [EMAIL PROTECTED] on 2008/08/13 03:10:16
VMS-specific follow-up to tempfile name changes in 34182, plus
a TODO in dup.t that's long since to-done.
Affected files ...
... //depot/perl/t/io/dup.t#26 edit
... //depot/perl/t/io/fs.t#64 edit
... //depot/perl/t/op/runlevel.t#28 edit
Differences ...
==== //depot/perl/t/io/dup.t#26 (xtext) ====
Index: perl/t/io/dup.t
--- perl/t/io/dup.t#25~34182~ 2008-08-07 08:21:57.000000000 -0700
+++ perl/t/io/dup.t 2008-08-12 20:10:16.000000000 -0700
@@ -38,19 +38,12 @@
$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 @@
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" }
==== //depot/perl/t/io/fs.t#64 (xtext) ====
Index: perl/t/io/fs.t
--- perl/t/io/fs.t#63~34182~ 2008-08-07 08:21:57.000000000 -0700
+++ perl/t/io/fs.t 2008-08-12 20:10:16.000000000 -0700
@@ -437,7 +437,7 @@
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 {
==== //depot/perl/t/op/runlevel.t#28 (xtext) ====
Index: perl/t/op/runlevel.t
--- perl/t/op/runlevel.t#27~34180~ 2008-08-07 03:12:44.000000000 -0700
+++ perl/t/op/runlevel.t 2008-08-12 20:10:16.000000000 -0700
@@ -44,7 +44,7 @@
my $status = $?;
$results =~ s/\n+$//;
# allow expected output to be written as if $prog is on STDIN
- $results =~ s/$::tempfile_regexp/-/g;
+ $results =~ s/$::tempfile_regexp/-/ig;
$results =~ s/\n%[A-Z]+-[SIWEF]-.*$// if $Is_VMS; # clip off DCL status
msg
$expected =~ s/\n+$//;
if ($results ne $expected) {
End of Patch.
