Re: New harness is failing things

Message-Id: <200012061300.NAA10567@mikado.tiuk.ti.com>

p4raw-id: //depot/perl@8012

diff --git a/lib/Test/Harness.pm b/lib/Test/Harness.pm
index a3c1753..a8038df 100644 (file)
--- a/lib/Test/Harness.pm
+++ b/lib/Test/Harness.pm
@@ -121,7 +121,7 @@ sub runtests {
                        $ok++;
                        $totok++;
                    }
-               } elsif (/^ok\s*(\d*)(\s*\#\s*[Ss]kip\S*(?:(?>\s+)(.+))?)?$/) {
+               } elsif (/^ok\s*(\d*) *(\s*\#\s*[Ss]kip\S*(?:(?>\s+)(.+))?)?$/) {
                    $this = $1 if $1 > 0;
                    print "${ml}ok $this/$max" if $ml;
                    $ok++;
@@ -138,8 +138,13 @@ sub runtests {
                      $skip_reason = $reason;
                    }
                    $bonus++, $totbonus++ if $todo{$this};
+               } elsif (/^ok\s*(\d*)\s*\#([^\r]*)$/) {
+                   $this = $1 if $1 > 0;
+                   print "${ml}ok $this/$max" if $ml;
+                   $ok++;
+                   $totok++;
                } else {
-                   # an ok or not ok not matching the 2 cases above...
+                   # an ok or not ok not matching the 3 cases above...
                    # just ignore it for compatibility with TEST
                    next;
                }