X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2FTEST;h=98d5fe3c17746d236702128c0ae6ded5e9b7a909;hb=93dfd55ec6c7f4ad52d53a9c024a8ac903bff254;hp=df121e851ba3a1261017ee0d5b00f0320ef6accd;hpb=bb36583767bf215eda3dc8674c27c74a3313c6d7;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/TEST b/t/TEST
index df121e8..98d5fe3 100755
--- a/t/TEST
+++ b/t/TEST
@@ -1,15 +1,18 @@
 #!./perl
 
-# 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 && $ARGV[0] eq '-v') {
-    $verbose = 1;
-    shift;
+# Cheesy version of Getopt::Std.  Maybe we should replace it with that.
+if ($#ARGV >= 0) {
+    foreach my $idx (0..$#ARGV) {
+	next unless $ARGV[$idx] =~ /^-(\w+)$/;
+	$verbose = 1 if $1 eq 'v';
+	$with_utf= 1 if $1 eq 'utf8';
+	splice(@ARGV, $idx, 1);
+    }
 }
 
 chdir 't' if -f 't/TEST';
@@ -17,26 +20,14 @@ 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{PERL_DESTRUCT_LEVEL} = '2';
+# check leakage for embedders
+$ENV{PERL_DESTRUCT_LEVEL} = 2 unless exists $ENV{PERL_DESTRUCT_LEVEL};
+
 $ENV{EMXSHELL} = 'sh';        # For OS/2
 
 if ($#ARGV == -1) {
     @ARGV = split(/[ \n]/,
-      `echo base/*.t comp/*.t cmd/*.t io/*.t; echo op/*.t pragma/*.t lib/*.t`);
-}
-
-if ($^O eq 'os2' || $^O eq 'qnx') {
-    $sharpbang = 0;
-}
-else {
-    open(CONFIG, "../config.sh");
-    while (<CONFIG>) {
-	if (/sharpbang='(.*)'/) {
-	    $sharpbang = ($1 eq '#!');
-	    last;
-	}
-    }
-    close(CONFIG);
+      `echo base/*.t comp/*.t cmd/*.t run/*.t io/*.t; echo op/*.t pragma/*.t lib/*.t`);
 }
 
 %infinite = ( 'comp/require.t', 1, 'op/bop.t', 1, 'lib/hostname.t', 1 ); 
@@ -55,11 +46,22 @@ TESTING COMPILER
 --------------------------------------------------------------------------------
 EOT
 
+    $ENV{PERLCC_TIMEOUT} = 120 
+          if ($type eq 'compile' && !$ENV{PERLCC_TIMEOUT});
+
     $bad = 0;
     $good = 0;
     $total = @tests;
     $files  = 0;
     $totmax = 0;
+    $maxlen = 0;
+    foreach (@tests) {
+	$len = length;
+	$maxlen = $len if $len > $maxlen;
+    }
+    # +3 : we want three dots between the test name and the "ok"
+    # -2 : the .t suffix
+    $dotdotdot = $maxlen + 3 - 2;
     while ($test = shift @tests) {
 
 	if ( $infinite{$test} && $type eq 'compile' ) {
@@ -71,38 +73,39 @@ EOT
 	}
 	$te = $test;
 	chop($te);
-	print "$te" . '.' x (18 - length($te));
-	if ($sharpbang) {
-	    -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 |") or print "can't compile.\n";
+	print "$te" . '.' x ($dotdotdot - length($te));
+
+	open(SCRIPT,"<$test") or 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 {
-	    open(SCRIPT,"$test") or 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 = '';
-	    }
+	    $switch = '';
+	}
 
-	    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 |") or print "can't compile.\n";
-	    }
+	my $utf = $with_utf ? '-I../lib -Mutf8'
+	                    : '';
+	my $testswitch = '-I. -MTestInit'; # -T will strict . from @INC
+	if ($type eq 'perl') {
+	    my $run = "./perl $testswitch $switch $utf $test |"; 
+	    open(RESULTS,$run) or print "can't run '$run': $!.\n";
 	}
+	else {
+	    my $compile =
+		"./perl $testswitch -I../lib ../utils/perlcc -o ".
+                "./$test.plc $utf ./$test ".
+		" && ./$test.plc |";
+	    open(RESULTS, $compile)
+		or print "can't compile '$compile': $!.\n";
+	    unlink "./$test.plc";
+	}
+
 	$ok = 0;
 	$next = 0;
 	while (<RESULTS>) {
@@ -118,9 +121,23 @@ EOT
 		    $ok = 1;
 		}
 		else {
-		    $next = $1, $ok = 0, last if /^not ok ([0-9]*)/;
-		    if (/^ok (\d+)(\s*#.*)?$/ && $1 == $next) {
-			$next = $next + 1;
+		    if (/^(not )?ok (\d+)(\s*#.*)?/ &&
+			$2 == $next) 
+		    {
+			my($not, $num, $extra) = ($1, $2, $3);
+			my($istodo) = $extra =~ /^\s*#\s*TODO/ if $extra;
+
+			if( $not && !$istodo ) {
+			    $ok = 0;
+			    $next = $num;
+			    last;
+			}
+			else {
+			    $next = $next + 1;
+			}
+                    }
+                    elsif (/^Bail out!\s*(.*)/i) { # magic words
+                        die "FAILED--Further testing stopped" . ($1 ? ": $1\n" : ".\n");
 		    }
 		    else {
 			$ok = 0;
@@ -161,12 +178,12 @@ EOT
 	}
     }
     else {
-	$pct = sprintf("%.2f", $good / $total * 100);
+	$pct = $files ? sprintf("%.2f", ($files - $bad) / $files * 100) : "0.00";
 	if ($bad == 1) {
-	    warn "Failed 1 test script out of $total, $pct% okay.\n";
+	    warn "Failed 1 test script out of $files, $pct% okay.\n";
 	}
 	else {
-	    warn "Failed $bad test scripts out of $total, $pct% okay.\n";
+	    warn "Failed $bad test scripts out of $files, $pct% okay.\n";
 	}
 	warn <<'SHRDLU';
    ### Since not all tests were successful, you may want to run some