X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=vms%2Ftest.com;h=05ff0bba6c7b438003801e81f5267e35dd867dc3;hb=f8759df64075c9d3934f9e4a040844547b02c0d2;hp=3e42a11474f337573c7c0b95514497d3253bf2ff;hpb=a0d0e21ea6ea90a22318550944fe6cb09ae10cda;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/vms/test.com b/vms/test.com
index 3e42a11..05ff0bb 100644
--- a/vms/test.com
+++ b/vms/test.com
@@ -1,12 +1,23 @@
 $!  Test.Com - DCL driver for perl5 regression tests
 $!
-$!  Version 1.0  30-Sep-1994
+$!  Version 1.1   4-Dec-1995
 $!  Charles Bailey  bailey@genetics.upenn.edu
 $
 $!  A little basic setup
 $   On Error Then Goto wrapup
 $   olddef = F$Environment("Default")
-$   Set Default Perl_Root:[t]
+$   If F$Search("t.dir").nes.""
+$   Then
+$       Set Default [.t]
+$   Else
+$       If F$TrnLNm("Perl_Root").nes.""
+$       Then 
+$           Set Default Perl_Root:[t]
+$       Else
+$           Write Sys$Error "Can't find test directory"
+$           Exit 44
+$       EndIf
+$   EndIf
 $
 $!  Pick up a copy of perl to use for the tests
 $   Delete/Log/NoConfirm Perl.;*
@@ -56,10 +67,12 @@ $   Macro/NoDebug/Object=Echo.Obj Sys$Input
 		.end echo
 $   Link/NoTrace Echo.Obj;
 $   Delete/Log/NoConfirm Echo.Obj;*
-$   echo = "$Perl_Root:[T]Echo.Exe"
+$   echo = "$" + F$Parse("Echo.Exe")
 $
 $!  And do it
-$   MCR Sys$Disk:[]Perl.
+$   testdir = "Directory/NoHead/NoTrail/Column=1"
+$   Define/User Perlshr Sys$Disk:[-]PerlShr.Exe
+$   MCR Sys$Disk:[]Perl. "''p1'" "''p2'" "''p3'" "''p4'" "''p5'" "''p6'"
 $   Deck/Dollar=$$END-OF-TEST$$
 # $RCSfile: TEST,v $$Revision: 4.1 $$Date: 92/08/07 18:27:00 $
 # Modified for VMS 30-Sep-1994  Charles Bailey  bailey@genetics.upenn.edu
@@ -79,18 +92,19 @@ foreach $file (@exclist) { $skip{$file}++; }
 
 $| = 1;
 
-#if ($ARGV[0] eq '-v') {
+@ARGV = grep($_,@ARGV);  # remove empty elements due to "''p1'" syntax
+
+if ($ARGV[0] eq '-v') {
     $verbose = 1;
-#    shift;
-#}
+    shift;
+}
 
 chdir 't' if -f 't/TEST';
 
 if ($ARGV[0] eq '') {
-    @files = split(/[ \n]/, `\$ dir/col=1/nohead/notrail [...]*.t;`);
-    foreach (@files) {
-      $fname = $_;
-      $fname =~ s/.*\]([\w\$\-]+\.T);.*/$1/;
+    foreach (<[.*]*.t>) {
+      s/.*[\[.]t./[./;
+      ($fname = $_) =~ s/.*\]//;
       if ($skip{"\L$fname"}) { push(@skipped,$_); }
       else { push(@ARGV,$_); }
     }
@@ -99,7 +113,7 @@ if ($ARGV[0] eq '') {
 if (@skipped) {
   print "The following tests were skipped because they rely extensively on\n";
   print " Unixisms not compatible with the current version of perl for VMS:\n";
-  print "\t",join("\n\t",@skipped);
+  print "\t",join("\n\t",@skipped),"\n\n";
 }
 
 $bad = 0;
@@ -111,7 +125,7 @@ while ($test = shift) {
     }
     $te = $test;
     chop($te);
-    print "$te" . '.' x (15 - length($te)) . "\n";
+    $te .= '.' x (24 - length($te));
 	open(script,"$test") || die "Can't run $test.\n";
 	$_ = <script>;
 	close(script);
@@ -125,7 +139,8 @@ while ($test = shift) {
     $next = 0;
     while (<results>) {
 	if ($verbose) {
-	    print $_;
+	    print "$te$_";
+	    $te = '';
 	}
 	unless (/^#/) {
 	    if (/^1\.\.([0-9]+)/) {
@@ -147,11 +162,11 @@ while ($test = shift) {
     }
     $next = $next - 1;
     if ($ok && $next == $max) {
-	print "ok\n";
+	print "${te}ok\n";
 	$good = $good + 1;
     } else {
 	$next += 1;
-	print "FAILED on test $next\n";
+	print "${te}FAILED on test $next\n";
 	$bad = $bad + 1;
 	$_ = $test;
 	if (/^base/) {