X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2FTEST;h=a684b2ab655b7837b7e9eb9d1081589e715b0814;hb=ac4c12e7aee90d31d5da776601addbfd9d738a5a;hp=0b996f42d458a3cbaff8247f2d312314ae0799be;hpb=ff68c7194e176ca1907544a3a65684b76834d0fe;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/TEST b/t/TEST
index 0b996f4..a684b2a 100755
--- a/t/TEST
+++ b/t/TEST
@@ -1,27 +1,27 @@
 #!./perl
 
-# $RCSfile: TEST,v $$Revision: 4.1 $$Date: 92/08/07 18:27:00 $
+# Last change: Fri Jan 10 09:57:03 WET 1997
 
 # 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') {
+if ($#ARGV >= 0 && $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" 
+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 '') {
+if ($#ARGV == -1) {
     @ARGV = split(/[ \n]/,
-      `echo base/*.t comp/*.t cmd/*.t io/*.t; echo op/*.t lib/*.t`);
+      `echo base/*.t comp/*.t cmd/*.t io/*.t; echo op/*.t pragma/*.t lib/*.t`);
 }
 
 if ($^O eq 'os2' || $^O eq 'qnx') {
@@ -41,6 +41,8 @@ else {
 $bad = 0;
 $good = 0;
 $total = @ARGV;
+$files  = 0;
+$totmax = 0;
 while ($test = shift) {
     if ($test =~ /^$/) {
 	next;
@@ -49,11 +51,12 @@ while ($test = shift) {
     chop($te);
     print "$te" . '.' x (18 - length($te));
     if ($sharpbang) {
-	open(results,"./$test |") || (print "can't run.\n");
+	-x $test || (print "isn't executable.\n");
+	open(RESULTS,"./$test |") || (print "can't run.\n");
     } else {
-	open(script,"$test") || die "Can't run $test.\n";
-	$_ = <script>;
-	close(script);
+	open(SCRIPT,"$test") || die "Can't run $test.\n";
+	$_ = <SCRIPT>;
+	close(SCRIPT);
 	if (/#!..perl(.*)/) {
 	    $switch = $1;
 	    if ($^O eq 'VMS') {
@@ -63,11 +66,11 @@ 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>) {
+    while (<RESULTS>) {
 	if ($verbose) {
 	    print $_;
 	}
@@ -80,7 +83,7 @@ while ($test = shift) {
 		$ok = 1;
 	    } else {
 		$next = $1, $ok = 0, last if /^not ok ([0-9]*)/;
-		if (/^ok (.*)/ && $1 == $next) {
+		if (/^ok (\d+)(\s*#.*)?$/ && $1 == $next) {
 		    $next = $next + 1;
 		} else {
 		    $ok = 0;
@@ -99,7 +102,7 @@ while ($test = shift) {
 	}
     } else {
 	$next += 1;
-	print "FAILED on test $next\n";
+	print "FAILED at test $next\n";
 	$bad = $bad + 1;
 	$_ = $test;
 	if (/^base/) {
@@ -111,17 +114,31 @@ while ($test = shift) {
 if ($bad == 0) {
     if ($ok) {
 	print "All tests successful.\n";
+	# XXX add mention of 'perlbug -ok' ?
     } else {
 	die "FAILED--no tests were run for some reason.\n";
     }
 } else {
     $pct = sprintf("%.2f", $good / $total * 100);
     if ($bad == 1) {
-	warn "Failed 1 test, $pct% okay.\n";
+	warn "Failed 1 test script out of $total, $pct% okay.\n";
     } else {
-	die "Failed $bad/$total tests, $pct% okay.\n";
+	warn "Failed $bad test scripts out of $total, $pct% okay.\n";
     }
+       warn <<'SHRDLU';
+   ### Since not all tests were successful, you may want to run some
+   ### of them individually and examine any diagnostic messages they
+   ### produce.  See the INSTALL document's section on "make test".
+SHRDLU
+       warn <<'SHRDLU' if $good / $total > 0.8;
+   ###
+   ### Since most tests were successful, you have a good chance to
+   ### get information with better granularity by running
+   ###     ./perl harness
+   ### in directory ./t.
+SHRDLU
 }
 ($user,$sys,$cuser,$csys) = times;
-print sprintf("u=%g  s=%g  cu=%g  cs=%g  files=%d  tests=%d\n",
+print sprintf("u=%g  s=%g  cu=%g  cs=%g  scripts=%d  tests=%d\n",
     $user,$sys,$cuser,$csys,$files,$totmax);
+exit ($bad != 0);