applied suggested patch, modulo already applied parts

	Message-id: <01JAF9UAV9XG002O0W@mail.newman.upenn.edu>
	Subject: [Patch 5.005_56] VMS consolidated patch #2

p4raw-id: //depot/perl@3357

6 files changed, 22 insertions, 9 deletions

diff --git a/t/op/filetest.t b/t/op/filetest.t
index 9228b5730b..7e03c42949 100755
--- a/t/op/filetest.t
+++ b/t/op/filetest.t
@@ -3,6 +3,7 @@
 # There are few filetest operators that are portable enough to test.
 # See pod/perlport.pod for details.
 
+use Config;
 BEGIN {
     chdir 't' if -d 't';
 }
@@ -50,8 +51,12 @@ eval '$> = $oldeuid';	# switch uid back (may not be implemented)
 
 # this would fail for the euid 1
 # (unless we have unpacked the source code as uid 1...)
-print "not " unless -w 'op';
-print "ok 8\n";
+if ($Config{d_seteuid}) {
+    print "not " unless -w 'op';
+    print "ok 8\n";
+} else {
+    print "ok 8 #skipped, no seteuid\n";
+}
 
 print "not " unless -x 'op'; # Hohum.  Are directories -x everywhere?
 print "ok 9\n";
diff --git a/t/op/taint.t b/t/op/taint.t
index d75bc1807a..fdd1c79b83 100755
--- a/t/op/taint.t
+++ b/t/op/taint.t
@@ -19,6 +19,13 @@ use Config;
 # just because Errno possibly failing.
 eval { require Errno; import Errno };
 
+BEGIN {
+  if ($^O eq 'VMS' && !defined($Config{d_setenv})) {
+      $ENV{PATH} = $ENV{PATH};
+      $ENV{TERM} = $ENV{TERM} ne ''? $ENV{TERM} : 'dummy';
+  }
+}
+
 my $Is_VMS = $^O eq 'VMS';
 my $Is_MSWin32 = $^O eq 'MSWin32';
 my $Is_Dos = $^O eq 'dos';
@@ -33,7 +40,7 @@ if ($Is_VMS) {
     }
     eval <<EndOfCleanup;
 	END {
-	    \$ENV{PATH} = '';
+	    \$ENV{PATH} = '' if $Config{d_setenv};
 	    warn "# Note: logical name 'PATH' may have been deleted\n";
 	    \@ENV{keys %old} = values %old;
 	}
diff --git a/t/pragma/warn/doio b/t/pragma/warn/doio
index cd0d55831a..97f0804bfa 100644
--- a/t/pragma/warn/doio
+++ b/t/pragma/warn/doio
@@ -44,7 +44,8 @@
 __END__
 # doio.c
 use warning 'io' ;
-open(F, "|$^X -e 1|")
+open(F, '|'.($^O eq 'VMS' ? 'mcr ':'')."$^X -e 1|");
+close(F);
 EXPECT
 Can't do bidirectional pipe at - line 3.
 ########
@@ -111,4 +112,4 @@ use warning 'io' ;
 exec "lskdjfalksdjfdjfkls", "abc" ;
 EXPECT
 OPTION regex
-Can't exec "lskdjfalksdjfdjfkls": .+
+Can't exec "lskdjfalksdjfdjfkls(:? abc)?": .+
diff --git a/t/pragma/warn/mg b/t/pragma/warn/mg
index 44e7634952..14307e0de0 100644
--- a/t/pragma/warn/mg
+++ b/t/pragma/warn/mg
@@ -16,8 +16,8 @@ No such signal: SIGFRED at - line 3.
 ########
 # mg.c
 use warning 'signal' ;
-if ($^O eq 'MSWin32') {
-    print "SKIPPED\n# win32, can't kill() to raise()\n"; exit;
+if ($^O eq 'MSWin32' || $^O eq 'VMS') {
+    print "SKIPPED\n# $^O, can't kill() to raise()\n"; exit;
 }
 $|=1;
 $SIG{"INT"} = "fred"; kill "INT",$$;
diff --git a/t/pragma/warn/pp_sys b/t/pragma/warn/pp_sys
index 7588827744..8f2c255bc3 100644
--- a/t/pragma/warn/pp_sys
+++ b/t/pragma/warn/pp_sys
@@ -113,7 +113,7 @@ ghi
 .
 $= = 1 ;
 $- =1 ;
-open STDOUT, ">/dev/null" ;
+open STDOUT, ">".($^O eq 'VMS'? 'NL:' : '/dev/null') ;
 write ;
 EXPECT
 page overflow at - line 13.
diff --git a/t/pragma/warn/sv b/t/pragma/warn/sv
index 0f1d83c2e5..f453de96d3 100644
--- a/t/pragma/warn/sv
+++ b/t/pragma/warn/sv
@@ -181,7 +181,7 @@ Subroutine fred redefined at - line 5.
 ########
 # sv.c
 use warning 'printf' ;
-open F, ">/dev/null" ;
+open F, ">".($^O eq 'VMS'? 'NL:' : '/dev/null') ;
 printf F "%q\n" ;
 my $a = sprintf "%q" ;
 printf F "%" ;