Integrate perlio:

[p5sagit/p5-mst-13.2.git] / t / TEST

diff --git a/t/TEST b/t/TEST
index a2c8899..9dd34f3 100755 (executable)
--- a/t/TEST
+++ b/t/TEST
@@ -8,9 +8,13 @@ $| = 1;
 # 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+)$/;
+       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);
     }
 }
@@ -20,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 run/*.t io/*.t; echo op/*.t pragma/*.t lib/*.t pod/*.t camel-III/*.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$/;
+    }
+}
+
+unless (@ARGV) {
+    foreach my $dir (qw(base comp cmd run io op pragma lib pod)) {
+        _find_tests($dir);
+    }
 }
 
 # %infinite = ( 'comp/require.t', 1, 'op/bop.t', 1, 'lib/hostname.t', 1 );
+%infinite = ();
 
-_testprogs('perl', @ARGV);
-_testprogs('compile', @ARGV) if (-e "../testcompile");
+if ($deparse) {
+    _testprogs('deparse', @ARGV);
+} else {
+    _testprogs('perl', @ARGV);
+    _testprogs('compile', @ARGV) if (-e "../testcompile");
+}
 
 sub _testprogs {
     $type = shift @_;
@@ -46,6 +91,12 @@ TESTING COMPILER
 --------------------------------------------------------------------------------
 EOT
 
+    print <<'EOT' if ($type eq 'deparse');
+--------------------------------------------------------------------------------
+TESTING DEPARSER
+--------------------------------------------------------------------------------
+EOT
+
     $ENV{PERLCC_TIMEOUT} = 120
           if ($type eq 'compile' && !$ENV{PERLCC_TIMEOUT});
 
@@ -71,13 +122,23 @@ EOT
        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') {
@@ -89,10 +150,28 @@ EOT
            $switch = '';
        }
 
+       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 'perl') {
+       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";
        }
@@ -113,8 +192,9 @@ 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;
@@ -126,6 +206,7 @@ EOT
                    {
                        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;
@@ -146,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) {