X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2FTEST;h=9dd34f35b04dae39877d98303feec171cdd26353;hb=6652e2a8e5ecd015484db83738b9cbad26c396bb;hp=cfee26c00da077c31b1536257354baa6e2c54990;hpb=0e06870bf080a38cda51c06c6612359afc2334e1;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/TEST b/t/TEST
index cfee26c..9dd34f3 100755
--- a/t/TEST
+++ b/t/TEST
@@ -1,15 +1,22 @@
 #!./perl
 
-# Last change: Fri May 28 03:16:57 BST 1999
-
 # 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] =~ /^-(\S+)$/;
+	$verbose = 1 if $1 eq 'v';
+	$with_utf= 1 if $1 eq 'utf8';
+	if ($1 =~ /^deparse(,.+)?$/) {
+	    $deparse = 1;
+	    $deparse_opts = $1;
+	}
+	splice(@ARGV, $idx, 1);
+    }
 }
 
 chdir 't' if -f 't/TEST';
@@ -17,20 +24,61 @@ 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';
 
+if ($ENV{PERL_3LOG}) {
+    unless (-x 'perl.third') {
+	unless (-x '../perl.third') {
+	    die "You need to run \"make perl.third first.\n";
+	}
+	else {
+	    print "Symlinking ../perl.third as perl.third...\n";
+	    die "Failed to symlink: $!\n"
+		unless symlink("../perl.third", "perl.third");
+	    die "Symlinked but no executable perl.third: $!\n"
+		unless -x 'perl.third';
+	}
+    }
+}
+
 # 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`);
+
+# Roll your own File::Find!
+use TestInit;
+use File::Spec;
+my $curdir = File::Spec->curdir;
+my $updir  = File::Spec->updir;
+
+sub _find_tests {
+    my($dir) = @_;
+    opendir DIR, $dir || die "Trouble opening $dir: $!";
+    foreach my $f (sort { $a cmp $b } readdir DIR) {
+        next if $f eq $curdir or $f eq $updir;
+
+        my $fullpath = File::Spec->catdir($dir, $f);
+
+        _find_tests($fullpath) if -d $fullpath;
+        push @ARGV, $fullpath if $f =~ /\.t$/;
+    }
 }
 
-%infinite = ( 'comp/require.t', 1, 'op/bop.t', 1, 'lib/hostname.t', 1 ); 
+unless (@ARGV) {
+    foreach my $dir (qw(base comp cmd run io op pragma lib pod)) {
+        _find_tests($dir);
+    }
+}
 
-_testprogs('perl', @ARGV);
-_testprogs('compile', @ARGV) if (-e "../testcompile"); 
+# %infinite = ( 'comp/require.t', 1, 'op/bop.t', 1, 'lib/hostname.t', 1 );
+%infinite = ();
+
+if ($deparse) {
+    _testprogs('deparse', @ARGV);
+} else {
+    _testprogs('perl', @ARGV);
+    _testprogs('compile', @ARGV) if (-e "../testcompile");
+}
 
 sub _testprogs {
     $type = shift @_;
@@ -43,7 +91,13 @@ TESTING COMPILER
 --------------------------------------------------------------------------------
 EOT
 
-    $ENV{PERLCC_TIMEOUT} = 120 
+    print <<'EOT' if ($type eq 'deparse');
+--------------------------------------------------------------------------------
+TESTING DEPARSER
+--------------------------------------------------------------------------------
+EOT
+
+    $ENV{PERLCC_TIMEOUT} = 120
           if ($type eq 'compile' && !$ENV{PERLCC_TIMEOUT});
 
     $bad = 0;
@@ -62,19 +116,29 @@ EOT
     while ($test = shift @tests) {
 
 	if ( $infinite{$test} && $type eq 'compile' ) {
-	    print STDERR "$test creates infinite loop! Skipping.\n"; 
+	    print STDERR "$test creates infinite loop! Skipping.\n";
             next;
 	}
 	if ($test =~ /^$/) {
 	    next;
 	}
+	if ($type eq 'deparse') {
+	    if ($test eq "comp/redef.t") {
+		# Redefinition happens at compile time
+		next;
+	    }
+	    elsif ($test eq "lib/switch.t") {
+		# B::Deparse doesn't support source filtering
+		next;
+	    }
+	}
 	$te = $test;
 	chop($te);
 	print "$te" . '.' x ($dotdotdot - length($te));
 
 	open(SCRIPT,"<$test") or die "Can't run $test.\n";
 	$_ = <SCRIPT>;
-	close(SCRIPT);
+	close(SCRIPT) unless ($type eq 'deparse');
 	if (/#!.*perl(.*)$/) {
 	    $switch = $1;
 	    if ($^O eq 'VMS') {
@@ -86,14 +150,39 @@ EOT
 	    $switch = '';
 	}
 
-	if ($type eq 'perl') {
-	    open(RESULTS,"./perl$switch $test |") or print "can't run.\n";
+	my $file_opts = "";
+	if ($type eq 'deparse') {
+	    # Look for #line directives which change the filename
+	    while (<SCRIPT>) {
+		$file_opts .= ",-f$3$4"
+			if /^#\s*line\s+(\d+)\s+((\w+)|"([^"]+)")/;
+	    }
+	    close(SCRIPT);
+	}
+	my $utf = $with_utf ? '-I../lib -Mutf8'
+	                    : '';
+	my $testswitch = '-I. -MTestInit'; # -T will strict . from @INC
+	if ($type eq 'deparse') {
+	    my $deparse =
+		"./perl $testswitch $switch -I../lib -MO=-qq,Deparse,".
+		"-l$deparse_opts$file_opts ".
+		"./$test > ./$test.dp ".
+		"&& ./perl $testswitch $switch -I../lib ./$test.dp |";
+	    open(RESULTS, $deparse)
+		or print "can't deparse '$deparse': $!.\n";
+	}
+	elsif ($type eq 'perl') {
+	    my $run = "./perl $testswitch $switch $utf $test |";
+	    open(RESULTS,$run) or print "can't run '$run': $!.\n";
 	}
 	else {
-	    open(RESULTS, "./perl -I../lib ../utils/perlcc -o ./$test.plc ./$test "
-	    		 ." && ./$test.plc |")
-		or print "can't compile.\n";
-        unlink "./$test.plc";
+	    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;
@@ -103,17 +192,30 @@ EOT
 		print $_;
 	    }
 	    unless (/^#/) {
-		if (/^1\.\.([0-9]+)/) {
+		if (/^1\.\.([0-9]+)( todo ([\d ]+))?/) {
 		    $max = $1;
+                    %todo = map { $_ => 1 } split / /, $3 if $3;
 		    $totmax += $max;
 		    $files += 1;
 		    $next = 1;
 		    $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;
+                        $istodo = 1 if $todo{$num};
+
+			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");
@@ -125,6 +227,15 @@ EOT
 	    }
 	}
 	close RESULTS;
+	if ($type eq 'deparse') {
+	    unlink "./$test.dp";
+	}
+	if ($ENV{PERL_3LOG}) {
+	    my $tpp = $test;
+	    $tpp =~ s:/:_:g;
+	    $tpp =~ s:\.t$::;
+	    rename("perl.3log", "perl.3log.$tpp");
+	}
 	$next = $next - 1;
 	if ($ok && $next == $max) {
 	    if ($max) {
@@ -168,8 +279,8 @@ EOT
    ### 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 
+   ### If you are testing the compiler, then ignore this message
+   ### and run
    ###      ./perl harness
    ### in the directory ./t.
 SHRDLU
@@ -177,7 +288,7 @@ SHRDLU
    ###
    ### Since most tests were successful, you have a good chance to
    ### get information with better granularity by running
-   ###     ./perl harness 
+   ###     ./perl harness
    ### in directory ./t.
 SHRDLU
     }