Fix gross win32 build issues

[p5sagit/p5-mst-13.2.git] / vms / test.com

diff --git a/vms/test.com b/vms/test.com
index 266ba16..6720dba 100644 (file)
--- a/vms/test.com
+++ b/vms/test.com
@@ -98,9 +98,7 @@ $
 $!  And do it
 $   Show Process/Accounting
 $   testdir = "Directory/NoHead/NoTrail/Column=1"
-$   oldshr = F$TrnLNm("''dbg'PerlShr")
 $   PerlShr_filespec = f$parse("Sys$Disk:[-]''dbg'PerlShr''exe'")
-$   If F$Length(oldshr).ne.0 Then Write Sys$Error "Superseding ''dbg'PerlShr . . ."
 $   Define 'dbg'Perlshr 'PerlShr_filespec'
 $   MCR Sys$Disk:[]Perl. "-I[-.lib]" - "''p3'" "''p4'" "''p5'" "''p6'"
 $   Deck/Dollar=$$END-OF-TEST$$
@@ -114,9 +112,10 @@ $   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');
+@ioexcl=('argv.t','dup.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',
@@ -135,6 +134,10 @@ 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') {
@@ -145,8 +148,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,$_); }
@@ -168,7 +172,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);
@@ -189,23 +193,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;
                }
+
            }
        }
     }
@@ -248,16 +280,8 @@ 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:
-$   If F$Length(oldshr).ne.0
-$   Then
-$     Write Sys$Error "restoring ''dbg'PerlShr . . ."
-$     Def/Translation=Concealed  'dbg'PerlShr 'oldshr'
-$   Else
-$     Deassign 'dbg'PerlShr
-$   EndIf
+$   deassign 'dbg'Perlshr
 $   Show Process/Accounting
 $   Set Default &olddef
 $   Set Message 'oldmsg'
 $   Exit
-
-