X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2FTEST;h=dfe429a5461e79e963af37fab140fb552fff37f0;hb=382b8d976294e2f8b1ced0b3776a3fb280b0ecd4;hp=0d91a47f3564021c81ddb77036e01119ac5c3baa;hpb=5303340c1eb77f5b18e12347ed4a7fa2eb6cd9f7;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/TEST b/t/TEST
old mode 100644
new mode 100755
index 0d91a47..dfe429a
--- a/t/TEST
+++ b/t/TEST
@@ -1,6 +1,6 @@
 #!./perl
 
-# $Header: TEST,v 3.0.1.2 90/11/10 02:09:07 lwall Locked $
+# $RCSfile: TEST,v $$Revision: 4.1 $$Date: 92/08/07 18:27:00 $
 
 # This is written in a peculiar style, since we're trying to avoid
 # most of the constructs we'll be testing for.
@@ -14,8 +14,14 @@ if ($ARGV[0] eq '-v') {
 
 chdir 't' if -f 't/TEST';
 
+die "You need to run \"make test\" first to set things up.\n" 
+  unless -e 'perl' or -e 'perl.exe';
+
+$ENV{EMXSHELL} = 'sh';        # For OS/2
+
 if ($ARGV[0] eq '') {
-    @ARGV = split(/[ \n]/,`echo base.* comp.* cmd.* io.* op.* lib.*`);
+    @ARGV = split(/[ \n]/,
+      `echo base/*.t comp/*.t cmd/*.t io/*.t; echo op/*.t lib/*.t`);
 }
 
 open(CONFIG,"../config.sh");
@@ -26,19 +32,17 @@ while (<CONFIG>) {
     }
 }
 $bad = 0;
+$good = 0;
+$total = @ARGV;
 while ($test = shift) {
-    if ($test =~ /\.orig$/) {
-	next;
-    }
-    if ($test =~ /\.rej$/) {
-	next;
-    }
-    if ($test =~ /~$/) {
+    if ($test =~ /^$/) {
 	next;
     }
-    print "$test" . '.' x (16 - length($test));
+    $te = $test;
+    chop($te);
+    print "$te" . '.' x (15 - length($te));
     if ($sharpbang) {
-	open(results,"./$test|") || (print "can't run.\n");
+	open(results,"./$test |") || (print "can't run.\n");
     } else {
 	open(script,"$test") || die "Can't run $test.\n";
 	$_ = <script>;
@@ -48,7 +52,7 @@ while ($test = shift) {
 	} else {
 	    $switch = '';
 	}
-	open(results,"./perl$switch $test|") || (print "can't run.\n");
+	open(results,"./perl$switch $test |") || (print "can't run.\n");
     }
     $ok = 0;
     $next = 0;
@@ -59,9 +63,12 @@ while ($test = shift) {
 	unless (/^#/) {
 	    if (/^1\.\.([0-9]+)/) {
 		$max = $1;
+		$totmax += $max;
+		$files += 1;
 		$next = 1;
 		$ok = 1;
 	    } else {
+		$next = $1, $ok = 0, last if /^not ok ([0-9]*)/;
 		if (/^ok (.*)/ && $1 == $next) {
 		    $next = $next + 1;
 		} else {
@@ -73,6 +80,7 @@ while ($test = shift) {
     $next = $next - 1;
     if ($ok && $next == $max) {
 	print "ok\n";
+	$good = $good + 1;
     } else {
 	$next += 1;
 	print "FAILED on test $next\n";
@@ -91,11 +99,13 @@ if ($bad == 0) {
 	die "FAILED--no tests were run for some reason.\n";
     }
 } else {
+    $pct = sprintf("%.2f", $good / $total * 100);
     if ($bad == 1) {
-	die "Failed 1 test.\n";
+	warn "Failed 1 test, $pct% okay.\n";
     } else {
-	die "Failed $bad tests.\n";
+	die "Failed $bad/$total tests, $pct% okay.\n";
     }
 }
 ($user,$sys,$cuser,$csys) = times;
-print sprintf("u=%g  s=%g  cu=%g  cs=%g\n",$user,$sys,$cuser,$csys);
+print sprintf("u=%g  s=%g  cu=%g  cs=%g  files=%d  tests=%d\n",
+    $user,$sys,$cuser,$csys,$files,$totmax);