Not quite so relicy as thought in #11651 (op/concat #4 and #5

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

diff --git a/vms/test.com b/vms/test.com
index 80f3452..7eb957d 100644 (file)
--- a/vms/test.com
+++ b/vms/test.com
@@ -115,7 +115,7 @@ 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',
@@ -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;
+               }
+
            }
        }
     }