X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fop%2Frunlevel.t;h=2be2eec01917fea88e0297e129c7932e93df4c9b;hb=137443ea0a858c43f5a720730cac6209a7d41948;hp=ca6aac5e5b48f09299ff2da785637db628460822;hpb=1e422769b80038b1bfc4f5af33438b87cc1c7a22;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/op/runlevel.t b/t/op/runlevel.t
old mode 100644
new mode 100755
index ca6aac5..2be2eec
--- a/t/op/runlevel.t
+++ b/t/op/runlevel.t
@@ -16,7 +16,9 @@
 
 chdir 't' if -d 't';
 @INC = "../lib";
-$ENV{PERL5LIB} = "../lib";
+$Is_VMS = $^O eq 'VMS';
+$Is_MSWin32 = $^O eq 'MSWin32';
+$ENV{PERL5LIB} = "../lib" unless $Is_VMS;
 
 $|=1;
 
@@ -26,22 +28,29 @@ print "1..", scalar @prgs, "\n";
 
 $tmpfile = "runltmp000";
 1 while -f ++$tmpfile;
-END { unlink $tmpfile if $tmpfile; }
+END { if ($tmpfile) { 1 while unlink $tmpfile; } }
 
 for (@prgs){
     my $switch;
-    if (s/^\s*-\w+//){
-       $switch = $&;
+    if (s/^\s*(-\w+)//){
+       $switch = $1;
     }
     my($prog,$expected) = split(/\nEXPECT\n/, $_);
-    open TEST, "| sh -c './perl $switch' >$tmpfile 2>&1";
-    print TEST $prog, "\n";
+    open TEST, ">$tmpfile";
+    print TEST "$prog\n";
     close TEST;
-    $status = $?;
-    $results = `cat $tmpfile`;
+    my $results = $Is_VMS ?
+		  `MCR $^X "-I[-.lib]" $switch $tmpfile` :
+		      $Is_MSWin32 ?  
+			  `.\\perl -I../lib $switch $tmpfile 2>&1` :
+			      `sh -c './perl $switch $tmpfile' 2>&1`;
+    my $status = $?;
     $results =~ s/\n+$//;
+    # allow expected output to be written as if $prog is on STDIN
+    $results =~ s/runltmp\d+/-/g;
+    $results =~ s/\n%[A-Z]+-[SIWEF]-.*$// if $Is_VMS;  # clip off DCL status msg
     $expected =~ s/\n+$//;
-    if ( $results ne $expected){
+    if ($results ne $expected) {
        print STDERR "PROG: $switch\n$prog\n";
        print STDERR "EXPECTED:\n$expected\n";
        print STDERR "GOT:\n$results\n";
@@ -249,7 +258,7 @@ package main;
 open FH, ">&STDOUT";
 tie *FH, TEST;
 print FH "OK\n";
-print "DONE\n";
+print STDERR "DONE\n";
 EXPECT
 PRINT CALLED
 DONE