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

diff --git a/t/TEST b/t/TEST
old mode 100644
new mode 100755
index 451bbe6..dfe429a
--- a/t/TEST
+++ b/t/TEST
@@ -1,33 +1,50 @@
 #!./perl
 
-# $Header: TEST,v 1.0.1.1 88/01/24 03:55:39 root Exp $
+# $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.
 
+$| = 1;
+
 if ($ARGV[0] eq '-v') {
     $verbose = 1;
     shift;
 }
 
+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.*`);
+    @ARGV = split(/[ \n]/,
+      `echo base/*.t comp/*.t cmd/*.t io/*.t; echo op/*.t lib/*.t`);
 }
 
-open(config,"../config.sh");
-while (<config>) {
+open(CONFIG,"../config.sh");
+while (<CONFIG>) {
     if (/sharpbang='(.*)'/) {
 	$sharpbang = ($1 eq '#!');
 	last;
     }
 }
 $bad = 0;
+$good = 0;
+$total = @ARGV;
 while ($test = shift) {
-    print "$test...";
+    if ($test =~ /^$/) {
+	next;
+    }
+    $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";
+	open(script,"$test") || die "Can't run $test.\n";
 	$_ = <script>;
 	close(script);
 	if (/#!..perl(.*)/) {
@@ -35,9 +52,10 @@ 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;
     while (<results>) {
 	if ($verbose) {
 	    print $_;
@@ -45,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 {
@@ -59,13 +80,14 @@ 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";
 	$bad = $bad + 1;
 	$_ = $test;
 	if (/^base/) {
-	    die "Failed a basic test--cannot continue.";
+	    die "Failed a basic test--cannot continue.\n";
 	}
     }
 }
@@ -74,14 +96,16 @@ if ($bad == 0) {
     if ($ok) {
 	print "All tests successful.\n";
     } else {
-	die "FAILED--no tests were run for some reason.";
+	die "FAILED--no tests were run for some reason.\n";
     }
 } else {
+    $pct = sprintf("%.2f", $good / $total * 100);
     if ($bad == 1) {
-	die "Failed 1 test.";
+	warn "Failed 1 test, $pct% okay.\n";
     } else {
-	die "Failed $bad tests.";
+	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);