X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=vms%2Ftest.com;h=372ed74a22227213aeea2aa420607d1b87420652;hb=7dc9aaa56b11c3e04f31eb9de23451166e23126f;hp=5bb999d5a465de76f289e3940a8432efd1916deb;hpb=925fd5a3f200998584b0c9f5f508f038863055cb;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/vms/test.com b/vms/test.com
index 5bb999d..372ed74 100644
--- a/vms/test.com
+++ b/vms/test.com
@@ -19,7 +19,7 @@ $           Write Sys$Error "Can't find test directory"
 $           Exit 44
 $       EndIf
 $   EndIf
-$   Set Message /Facility/Severity/Identification/Text
+$   Set Message /NoFacility/NoSeverity/NoIdentification/NoText
 $
 $   exe = ".Exe"
 $   If p1.nes."" Then exe = p1
@@ -41,9 +41,13 @@ $   if p2.nes."" then dbg  = "dbg"
 $   if p2.nes."" then ndbg = "ndbg"
 $!
 $!  Pick up a copy of perl to use for the tests
-$   Delete/Log/NoConfirm Perl.;*
+$   If F$Search("Perl.").nes."" Then Delete/Log/NoConfirm Perl.;*
 $   Copy/Log/NoConfirm [-]'ndbg'Perl'exe' []Perl.
-$
+$!
+$!  Pick up a copy of vmspipe.com to use for the tests
+$   If F$Search("VMSPIPE.COM").nes."" then Delete/Log/Noconfirm VMSPIPE.COM;*
+$   Copy/Log/NoConfirm [-]VMSPIPE.COM []
+$!
 $!  Make the environment look a little friendlier to tests which assume Unix
 $   cat == "Type"
 $   Macro/NoDebug/NoList/Object=Echo.Obj Sys$Input
@@ -86,6 +90,7 @@ $   Macro/NoDebug/NoList/Object=Echo.Obj Sys$Input
 		movl	#1,r0
 		ret	
 		.end echo
+$   If F$Search("Echo.Exe").nes."" Then Delete/Log/NoConfirm Echo.Exe;*
 $   Link/NoMap/NoTrace/Exe=Echo.Exe Echo.Obj;
 $   Delete/Log/NoConfirm Echo.Obj;*
 $   echo == "$" + F$Parse("Echo.Exe")
@@ -93,11 +98,11 @@ $
 $!  And do it
 $   Show Process/Accounting
 $   testdir = "Directory/NoHead/NoTrail/Column=1"
-$   Define/User 'dbg'Perlshr Sys$Disk:[-]'dbg'PerlShr'exe'
-$   set message/nofacil/nosever/noiden/notext
+$   PerlShr_filespec = f$parse("Sys$Disk:[-]''dbg'PerlShr''exe'")
+$   Define 'dbg'Perlshr 'PerlShr_filespec'
 $   MCR Sys$Disk:[]Perl. "-I[-.lib]" - "''p3'" "''p4'" "''p5'" "''p6'"
 $   Deck/Dollar=$$END-OF-TEST$$
-# $RCSfile: TEST,v $$Revision: 4.1 $$Date: 92/08/07 18:27:00 $
+# $RCSfile: test.com,v $$Revision: 1.1 $$Date: 2001/11/07 06:58:50 $
 # Modified for VMS 30-Sep-1994  Charles Bailey  bailey@newman.upenn.edu
 #
 # This is written in a peculiar style, since we're trying to avoid
@@ -107,27 +112,28 @@ $   Deck/Dollar=$$END-OF-TEST$$
 # of Unixisms in the tests.  (The Perl operators being tested may work fine,
 # but the tests may use other operators which don't.)
 use Config;
+use File::Spec;
 
 @compexcl=('cpp.t');
-@ioexcl=('argv.t','dup.t','fs.t','pipe.t','openpid.t');
-@libexcl=('db-btree.t','db-hash.t','db-recno.t',
-          'gdbm.t','io_dup.t', 'io_pipe.t', 'io_poll.t', 'io_sel.t',
-          'io_sock.t', 'io_unix.t',
-          'ndbm.t','odbm.t','open2.t','open3.t', 'ph.t', 'posix.t', 'dprof.t');
-
-# Note: POSIX is not part of basic build, but can be built
-# separately if you're using DECC
+@ioexcl=('dup.t');
+@libexcl=('io_dup.t', 'io_pipe.t', 'io_poll.t', 'io_sel.t',
+          'io_sock.t', 'io_unix.t');
+
 # io_xs.t tests the new_tmpfile routine, which doesn't work with the
 # VAXCRTL, since the file can't be stat()d, an Perl's do_open()
 # insists on stat()ing a file descriptor before it'll use it.
 push(@libexcl,'io_xs.t') if $Config{'vms_cc_type'} ne 'decc';
 
-@opexcl=('die_exit.t','exec.t','fork.t','glob.t','groups.t','magic.t','misc.t','stat.t');
+@opexcl=('die_exit.t','exec.t','groups.t','magic.t','stat.t');
 @exclist=(@compexcl,@ioexcl,@libexcl,@opexcl);
 foreach $file (@exclist) { $skip{$file}++; }
 
 $| = 1;
 
+# Let tests know they're running in the perl core.  Useful for modules
+# which live dual lives on CPAN.
+$ENV{PERL_CORE} = 1;
+
 @ARGV = grep($_,@ARGV);  # remove empty elements due to "''p1'" syntax
 
 if (lc($ARGV[0]) eq '-v') {
@@ -138,8 +144,9 @@ if (lc($ARGV[0]) eq '-v') {
 chdir 't' if -f 't/TEST';
 
 if ($ARGV[0] eq '') {
-    foreach (<[.*]*.t>) {
-      s/.*[\[.]t./[./;
+    foreach (<[-.ext...]*.t>, <[-.lib...]*.t>, <[.*]*.t>) {
+      $_ = File::Spec->abs2rel($_);
+      s/\[([a-z]+)/[.$1/;      # hmm, abs2rel doesn't do subdirs of the cwd
       ($fname = $_) =~ s/.*\]//;
       if ($skip{"\L$fname"}) { push(@skipped,$_); }
       else { push(@ARGV,$_); }
@@ -161,7 +168,7 @@ while ($test = shift) {
     }
     $te = $test;
     chop($te);
-    $te .= '.' x (24 - length($te));
+    $te .= '.' x (40 - length($te));
 	open(script,"$test") || die "Can't run $test.\n";
 	$_ = <script>;
 	close(script);
@@ -172,7 +179,7 @@ while ($test = shift) {
 	} else {
 	    $switch = '';
 	}
-	open(results,"\$ MCR Sys\$Disk:[]Perl. \"-I[-.lib]\" $switch $test |") || (print "can't run.\n");
+	open(results,"\$ MCR Sys\$Disk:[]Perl. \"-I[-.lib]\" $switch $test 2>&1|") || (print "can't run.\n");
     $ok = 0;
     $next = 0;
     $pending_not = 0;
@@ -182,23 +189,51 @@ while ($test = shift) {
 	    $te = '';
 	}
 	unless (/^#/) {
-	    if (/^1\.\.([0-9]+)/) {
+	    if (/^1\.\.([0-9]+)( todo ([\d ]+))?/) {
 		$max = $1;
+                %todo = map { $_ => 1 } split / /, $3 if $3;
 		$totmax += $max;
 		$files += 1;
 		$next = 1;
 		$ok = 1;
 	    } else {
-		$next = $1, $ok = 0, last if /^not ok ([0-9]*)/;
-		next if /^\s*$/; # our 'echo' substitute produces one more \n than Unix'
-		if (/^ok (.*)/ && $1 == $next) {
-		    $next = $1, $ok=0, last if $pending_not;
-		    $next = $next + 1;
-		} elsif (/^not/) {
-		    $pending_not = 1;
-		} else {
-		    $ok = 0;
+                # our 'echo' substitute produces one more \n than Unix'
+		next if /^\s*$/;
+
+
+                if (/^(not )?ok (\d+)[^#]*(\s*#.*)?/ &&
+                    $2 == $next)
+                {
+                    my($not, $num, $extra) = ($1, $2, $3);
+                    my($istodo) = $extra =~ /^\s*#\s*TODO/ if $extra;
+                    $istodo = 1 if $todo{$num};
+
+                    if( $not && !$istodo ) {
+                        $ok = 0;
+                        $next = $num;
+                        last;
+                    }
+                    elsif( $pending_not ) {
+                        $next = $num;
+                        $ok = 0;
+                    }
+                    else {
+                        $next = $next + 1;
+                    }
+                }
+                elsif(/^not $/) {
+                    # VMS has this problem.  It sometimes adds newlines
+                    # between prints.  This sometimes means you get
+                    # "not \nok 42"
+                    $pending_not = 1;
+                }
+                elsif (/^Bail out!\s*(.*)/i) { # magic words
+                    die "FAILED--Further testing stopped" . ($1 ? ": $1\n" : ".\n");
 		}
+		else {
+                    $ok = 0;
+		}
+
 	    }
 	}
     }
@@ -237,12 +272,12 @@ if ($bad == 0) {
     }
 }
 ($user,$sys,$cuser,$csys) = times;
-print sprintf("u=%g  s=%g  cu=%g  cs=%g  files=%d  tests=%d\n",
+print sprintf("u=%g  s=%g  cu=%g  cs=%g  scripts=%d  tests=%d\n",
     $user,$sys,$cuser,$csys,$files,$totmax);
 $$END-OF-TEST$$
 $ wrapup:
+$   deassign 'dbg'Perlshr
 $   Show Process/Accounting
-$   If F$Search("Echo.Exe").nes."" Then Delete/Log/NoConfirm Echo.Exe;*
 $   Set Default &olddef
 $   Set Message 'oldmsg'
 $   Exit