Minor test updates to accomodate new subprocess invocation

p4raw-id: //depot/vmsperl@5304

diff --git a/t/comp/script.t b/t/comp/script.t
index d0c12e9..a9bc47d 100755 (executable)
--- a/t/comp/script.t
+++ b/t/comp/script.t
@@ -6,7 +6,6 @@ print "1..3\n";
 
 $PERL = ($^O eq 'MSWin32') ? '.\perl' : './perl';
 $x = `$PERL -le "print 'ok';"`;
-if ($x =~ /DCL-W-NOCOMD/) { $x = `\$ mcr sys\$disk:[]perl. -e "print ""ok\n""";`; }
 
 if ($x eq "ok\n") {print "ok 1\n";} else {print "not ok 1\n";}
 
@@ -15,12 +14,10 @@ print try 'print "ok\n";'; print try "\n";
 close try;
 
 $x = `$PERL Comp.script`;
-if ($x =~ /DCL-W-NOCOMD/) { $x = `\$ mcr sys\$disk:[]perl. Comp.script`; }
 
 if ($x eq "ok\n") {print "ok 2\n";} else {print "not ok 2\n";}
 
 $x = `$PERL <Comp.script`;
-if ($x =~ /DCL-W-NOCOMD/) { $x = `\$ mcr sys\$disk:[]perl. <Comp.script`; }
 
 if ($x eq "ok\n") {print "ok 3\n";} else {print "not ok 3\n";}
 

diff --git a/t/op/goto.t b/t/op/goto.t
index 7a5de5f..73fc79a 100755 (executable)
--- a/t/op/goto.t
+++ b/t/op/goto.t
@@ -30,8 +30,8 @@ print "#2\t:$foo: == 4\n";
 if ($foo == 4) {print "ok 2\n";} else {print "not ok 2\n";}
 
 $PERL = ($^O eq 'MSWin32') ? '.\perl' : './perl';
-$x = `$PERL -e "goto foo;" 2>&1`;
-if ($x =~ /DCL-W-NOCOMD/) { $x = `\$ mcr sys\$disk:[]perl. -e "goto foo;"`; }
+$CMD = qq[$PERL -e "goto foo;" ] . ($^O eq 'VMS' ? '' : ' 2>&1');
+$x = `$CMD`;
 
 if ($x =~ /label/) {print "ok 3\n";} else {print "not ok 3\n";}
 

diff --git a/t/op/split.t b/t/op/split.t
index 042f151..48e64e1 100755 (executable)
--- a/t/op/split.t
+++ b/t/op/split.t
@@ -48,10 +48,8 @@ print $_ eq '1:2:3:4:5:6:::' ? "ok 10\n" : "not ok 10 $_\n";
 
 # Does assignment to a list imply split to one more field than that?
 if ($^O eq 'MSWin32') { $foo = `.\\perl -D1024 -e "(\$a,\$b) = split;" 2>&1` }
+elsif ($^O eq 'VMS')  { $foo = `./perl "-D1024" -e "(\$a,\$b) = split;"` }
 else                  { $foo = `./perl -D1024 -e '(\$a,\$b) = split;' 2>&1` }
-if ($foo =~ /DCL-W-NOCOMD/) {
-  $foo = `\$ mcr sys\$disk:[]perl. "-D1024" -e "(\$a,\$b) = split;"`;
-}
 print $foo =~ /DEBUGGING/ || $foo =~ /SV = (VOID|IV\(3\))/ ? "ok 11\n" : "not ok 11\n";
 
 # Can we say how many fields to split to when assigning to a list?