Re: PATCH: Let Test::Harness bail out early (Was: Testing module dependencies)

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

diff --git a/t/TEST b/t/TEST
index c1d1905..cfee26c 100755 (executable)
--- a/t/TEST
+++ b/t/TEST
@@ -1,6 +1,6 @@
 #!./perl
 
-# Last change: Fri Jan 10 09:57:03 WET 1997
+# Last change: Fri May 28 03:16:57 BST 1999
 
 # This is written in a peculiar style, since we're trying to avoid
 # most of the constructs we'll be testing for.
@@ -43,11 +43,22 @@ TESTING COMPILER
 --------------------------------------------------------------------------------
 EOT
 
+    $ENV{PERLCC_TIMEOUT} = 120 
+          if ($type eq 'compile' && !$ENV{PERLCC_TIMEOUT});
+
     $bad = 0;
     $good = 0;
     $total = @tests;
     $files  = 0;
     $totmax = 0;
+    $maxlen = 0;
+    foreach (@tests) {
+       $len = length;
+       $maxlen = $len if $len > $maxlen;
+    }
+    # +3 : we want three dots between the test name and the "ok"
+    # -2 : the .t suffix
+    $dotdotdot = $maxlen + 3 - 2;
     while ($test = shift @tests) {
 
        if ( $infinite{$test} && $type eq 'compile' ) {
@@ -59,7 +70,7 @@ EOT
        }
        $te = $test;
        chop($te);
-       print "$te" . '.' x (18 - length($te));
+       print "$te" . '.' x ($dotdotdot - length($te));
 
        open(SCRIPT,"<$test") or die "Can't run $test.\n";
        $_ = <SCRIPT>;
@@ -79,9 +90,10 @@ EOT
            open(RESULTS,"./perl$switch $test |") or print "can't run.\n";
        }
        else {
-           open(RESULTS, "./perl -I../lib ../utils/perlcc ./$test "
-                        ."-run -verbose dcf -log ../compilelog |")
+           open(RESULTS, "./perl -I../lib ../utils/perlcc -o ./$test.plc ./$test "
+                        ." && ./$test.plc |")
                or print "can't compile.\n";
+        unlink "./$test.plc";
        }
 
        $ok = 0;
@@ -102,6 +114,9 @@ EOT
                    $next = $1, $ok = 0, last if /^not ok ([0-9]*)/;
                    if (/^ok (\d+)(\s*#.*)?$/ && $1 == $next) {
                        $next = $next + 1;
+                    }
+                    elsif (/^Bail out!\s*(.*)/i) { # magic words
+                        die "FAILED--Further testing stopped" . ($1 ? ": $1\n" : ".\n");
                    }
                    else {
                        $ok = 0;
@@ -142,12 +157,12 @@ EOT
        }
     }
     else {
-       $pct = sprintf("%.2f", $good / $total * 100);
+       $pct = $files ? sprintf("%.2f", ($files - $bad) / $files * 100) : "0.00";
        if ($bad == 1) {
-           warn "Failed 1 test script out of $total, $pct% okay.\n";
+           warn "Failed 1 test script out of $files, $pct% okay.\n";
        }
        else {
-           warn "Failed $bad test scripts out of $total, $pct% okay.\n";
+           warn "Failed $bad test scripts out of $files, $pct% okay.\n";
        }
        warn <<'SHRDLU';
    ### Since not all tests were successful, you may want to run some