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

diff --git a/t/TEST b/t/TEST
index 96c5ab2..44e6e40 100755
--- a/t/TEST
+++ b/t/TEST
@@ -7,19 +7,20 @@
 
 $| = 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{PERL_DESTRUCT_LEVEL} = '2';
 $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 pragma/*.t lib/*.t`);
 }
@@ -38,10 +39,34 @@ else {
     close(CONFIG);
 }
 
-$bad = 0;
-$good = 0;
-$total = @ARGV;
-while ($test = shift) {
+%infinite = ( 'comp/require.t', 1, 'op/bop.t', 1, 'lib/hostname.t', 1 ); 
+
+_testprogs('perl', @ARGV);
+_testprogs('compile', @ARGV) if (-e "../testcompile"); 
+
+sub _testprogs
+{
+	$type = shift @_;
+	@tests = @_;
+
+
+	print "
+--------------------------------------------------------------------------------
+TESTING COMPILER
+--------------------------------------------------------------------------------
+" if ($type eq 'compile');
+
+	$bad = 0;
+	$good = 0;
+	$total = @tests;
+	$files  = 0;
+	$totmax = 0;
+while ($test = shift @tests) {
+
+    if ( $infinite{$test} && $type eq 'compile' ) {
+		print STDERR "$test creates infinite loop! Skipping.\n"; 
+        next;
+	}
     if ($test =~ /^$/) {
 	next;
     }
@@ -49,11 +74,19 @@ 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");
+
+	if ($type eq 'perl')
+		{ open(RESULTS, "./$test |") || (print "can't run.\n"); }
+	else
+	{ 
+		open(RESULTS, "./perl -I../lib ../utils/perlcc ./$test -run -verbose dcf -log ../compilelog |") 
+											|| (print "can't compile.\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 +96,20 @@ while ($test = shift) {
 	} else {
 	    $switch = '';
 	}
-	open(results,"./perl$switch $test |") || (print "can't run.\n");
+
+	if ($type eq 'perl')
+	{
+		open(RESULTS,"./perl$switch $test |") || (print "can't run.\n");
+	}
+	else
+	{
+		open(RESULTS, "./perl -I../lib ../utils/perlcc ./$test -run -verbose dcf -log ../compilelog |") 
+											|| (print "can't compile.\n");
+	}
     }
     $ok = 0;
     $next = 0;
-    while (<results>) {
+    while (<RESULTS>) {
 	if ($verbose) {
 	    print $_;
 	}
@@ -80,7 +122,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 +141,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,6 +153,7 @@ 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";
     }
@@ -125,9 +168,21 @@ if ($bad == 0) {
    ### 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".
+   ### If you are testing the compiler, then ignore this message 
+   ### and run 
+   ###      ./perl harness
+   ### in the directory ./t.
+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  scripts=%d  tests=%d\n",
     $user,$sys,$cuser,$csys,$files,$totmax);
-exit $bad != 0;
+}
+exit ($bad != 0);