# 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);
}
}
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};
if ($#ARGV == -1) {
@ARGV = split(/[ \n]/,
- `echo base/*.t comp/*.t cmd/*.t run/*.t io/*.t; echo op/*.t pragma/*.t lib/*.t`);
+ `echo base/*.t comp/*.t cmd/*.t run/*.t io/*.t; echo op/*.t pragma/*.t lib/*.t pod/*.t`);
}
-%infinite = ( 'comp/require.t', 1, 'op/bop.t', 1, 'lib/hostname.t', 1 );
+# %infinite = ( 'comp/require.t', 1, 'op/bop.t', 1, 'lib/hostname.t', 1 );
-_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 @_;
--------------------------------------------------------------------------------
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;
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') {
$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'
: '';
- if ($type eq 'perl') {
- my $run = "./perl$switch $utf $test |";
+ 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 {
my $compile =
- "./perl -I../lib ../utils/perlcc -o ./$test.plc $utf ./$test "
- ." && ./$test.plc |";
+ "./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";
}
else {
if (/^(not )?ok (\d+)(\s*#.*)?/ &&
- $2 == $next)
+ $2 == $next)
{
my($not, $num, $extra) = ($1, $2, $3);
my($istodo) = $extra =~ /^\s*#\s*TODO/ if $extra;
}
}
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) {
### 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
###
### 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
}