X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2FTEST;h=96c5ab26a46082c2958cf9d771de87a976c17f3f;hb=f46c10df1e1751ec848e8b44d06a75d45607bf94;hp=abfa65af31eecd8bc06f7824fdc6524c4039f822;hpb=2b317908ea5309ab202d1cdbadccfdf42d10e2b1;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/TEST b/t/TEST
old mode 100644
new mode 100755
index abfa65a..96c5ab2
--- a/t/TEST
+++ b/t/TEST
@@ -1,6 +1,6 @@
 #!./perl
 
-# $RCSfile: TEST,v $$Revision: 4.0.1.1 $$Date: 91/06/07 11:59:30 $
+# 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.
@@ -14,38 +14,56 @@ 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/*.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`);
 }
 
-open(CONFIG,"../config.sh");
-while (<CONFIG>) {
-    if (/sharpbang='(.*)'/) {
-	$sharpbang = ($1 eq '#!');
-	last;
+if ($^O eq 'os2' || $^O eq 'qnx') {
+    $sharpbang = 0;
+}
+else {
+    open(CONFIG, "../config.sh");
+    while (<CONFIG>) {
+	if (/sharpbang='(.*)'/) {
+	    $sharpbang = ($1 eq '#!');
+	    last;
+	}
     }
+    close(CONFIG);
 }
+
 $bad = 0;
+$good = 0;
+$total = @ARGV;
 while ($test = shift) {
     if ($test =~ /^$/) {
 	next;
     }
     $te = $test;
     chop($te);
-    print "$te" . '.' x (15 - length($te));
+    print "$te" . '.' x (18 - 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>;
 	close(script);
 	if (/#!..perl(.*)/) {
 	    $switch = $1;
+	    if ($^O eq 'VMS') {
+		# Must protect uppercase switches with "" on command line
+		$switch =~ s/-([A-Z]\S*)/"-$1"/g;
+	    }
 	} 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;
@@ -72,7 +90,13 @@ while ($test = shift) {
     }
     $next = $next - 1;
     if ($ok && $next == $max) {
-	print "ok\n";
+	if ($max) {
+	    print "ok\n";
+	    $good = $good + 1;
+	} else {
+	    print "skipping test on this platform\n";
+	    $files -= 1;
+	}
     } else {
 	$next += 1;
 	print "FAILED on test $next\n";
@@ -91,12 +115,19 @@ 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 script out of $total, $pct% okay.\n";
     } else {
-	die "Failed $bad tests.\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
 }
 ($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;