Integrate mainline

[p5sagit/p5-mst-13.2.git] / t / TEST

diff --git a/t/TEST b/t/TEST
index 64da39c..e455043 100755 (executable)
--- a/t/TEST
+++ b/t/TEST
@@ -182,8 +182,6 @@ EOT
            close(SCRIPT);
        }
 
-       $test = $OVER{$test} if exists $OVER{$test};
-
        my $utf = $with_utf ? '-I../lib -Mutf8' : '';
        my $testswitch = '-I. -MTestInit'; # -T will strict . from @INC
        if ($type eq 'deparse') {
@@ -226,7 +224,7 @@ EOT
                    $ok = 1;
                }
                else {
-                   if (/^(not )?ok (\d+)(\s*#.*)?/ &&
+                   if (/^(not )?ok (\d+)[^#]*(\s*#.*)?/ &&
                        $2 == $next)
                    {
                        my($not, $num, $extra) = ($1, $2, $3);