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

diff --git a/vms/test.com b/vms/test.com
index 80f3452..372ed74 100644
--- a/vms/test.com
+++ b/vms/test.com
@@ -102,7 +102,7 @@ $   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
@@ -115,25 +115,25 @@ use Config;
 use File::Spec;
 
 @compexcl=('cpp.t');
-@ioexcl=('argv.t','dup.t','fs.t','pipe.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');
-
-# 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','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') {
@@ -189,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;
 		}
+
 	    }
 	}
     }