$| = 1;
+# Let tests know they're running in the perl core. Useful for modules
+# which live dual lives on CPAN.
+$ENV{PERL_CORE} = 1;
+
# Cheesy version of Getopt::Std. Maybe we should replace it with that.
+@argv = ();
if ($#ARGV >= 0) {
foreach my $idx (0..$#ARGV) {
- next unless $ARGV[$idx] =~ /^-(\S+)$/;
+ push( @argv, $ARGV[$idx] ), next unless $ARGV[$idx] =~ /^-(\S+)$/;
+ $core = 1 if $1 eq 'core';
$verbose = 1 if $1 eq 'v';
$with_utf= 1 if $1 eq 'utf8';
+ $byte_compile = 1 if $1 eq 'bytecompile';
+ $compile = 1 if $1 eq 'compile';
if ($1 =~ /^deparse(,.+)?$/) {
$deparse = 1;
$deparse_opts = $1;
}
- splice(@ARGV, $idx, 1);
}
}
+@ARGV = @argv;
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';
+ unless -e 'perl' or -e 'perl.exe' or -e 'perl.pm';
if ($ENV{PERL_3LOG}) { # Tru64 third(1) tool, see perlhack
unless (-x 'perl.third') {
}
unless (@ARGV) {
- foreach my $dir (qw(base comp cmd run io op lib)) {
+ foreach my $dir (qw(base comp cmd run io op uni)) {
_find_tests($dir);
}
+ _find_tests("lib") unless $core;
my $mani = File::Spec->catdir($updir, "MANIFEST");
if (open(MANI, $mani)) {
while (<MANI>) { # similar code in t/harness
if (m!^(ext/\S+/([^/]+\.t|test\.pl)|lib/\S+?(\.t|test\.pl))\s!) {
- push @ARGV, $1;
- $OVER{$1} = File::Spec->catdir($updir, $1);
+ $t = $1;
+ if (!$core || $t =~ m!^lib/[a-z]!)
+ {
+ $path = File::Spec->catdir($updir, $t);
+ push @ARGV, $path;
+ $name{$path} = $t;
+ }
}
}
} else {
%infinite = ();
if ($deparse) {
- _testprogs('deparse', @ARGV);
-} else {
- _testprogs('perl', @ARGV);
- _testprogs('compile', @ARGV) if (-e "../testcompile");
+ _testprogs('deparse', '', @ARGV);
+}
+elsif( $compile || $byte_compile ) {
+ _testprogs('compile', '', @ARGV) if $compile;
+ _testprogs('compile', '-B', @ARGV) if $byte_compile;
+}
+else {
+ _testprogs('compile', '', @ARGV) if -e "../testcompile";
+ _testprogs('perl', '', @ARGV);
}
sub _testprogs {
$type = shift @_;
+ $args = shift;
@tests = @_;
print <<'EOT' if ($type eq 'compile');
$total = @tests;
$files = 0;
$totmax = 0;
+
+ foreach (@tests) {
+ $name{$_} = File::Spec->catdir('t',$_) unless exists $name{$_};
+ }
my $maxlen = 0;
- my $maxsuflen = 0;
- foreach (@tests) { # The same code in lib/Test/Harness.pm:_run_all_tests
- my $suf = /\.(\w+)$/ ? $1 : '';
- my $len = length;
- my $suflen = length $suf;
- $maxlen = $len if $len > $maxlen;
- $maxsuflen = $suflen if $suflen > $maxsuflen;
+ foreach (@name{@tests}) {
+ s/\.\w+\z/./;
+ my $len = length ;
+ $maxlen = $len if $len > $maxlen;
}
# + 3 : we want three dots between the test name and the "ok"
- $dotdotdot = $maxlen + 3 - $maxsuflen;
+ $dotdotdot = $maxlen + 3 ;
while ($test = shift @tests) {
if ( $infinite{$test} && $type eq 'compile' ) {
next;
}
}
- $te = $test;
- $te =~ s/\.\w+$/./;
+ $te = $name{$test};
print "$te" . '.' x ($dotdotdot - length($te));
$test = $OVER{$test} if exists $OVER{$test};
- open(SCRIPT,"<$test") or die "Can't run $test.\n";
- $_ = <SCRIPT>;
- close(SCRIPT) unless ($type eq 'deparse');
- 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 = '';
- }
+ open(SCRIPT,"<$test") or die "Can't run $test.\n";
+ $_ = <SCRIPT>;
+ close(SCRIPT) unless ($type eq 'deparse');
+ if (/#!.*\bperl.*-\w*([tT])/) {
+ $switch = qq{"-$1"};
+ }
+ else {
+ $switch = '';
+ }
+ my $test_executable; # for 'compile' tests
my $file_opts = "";
if ($type eq 'deparse') {
# Look for #line directives which change the filename
close(SCRIPT);
}
- $test = $OVER{$test} if exists $OVER{$test};
-
my $utf = $with_utf ? '-I../lib -Mutf8' : '';
my $testswitch = '-I. -MTestInit'; # -T will strict . from @INC
if ($type eq 'deparse') {
or print "can't deparse '$deparse': $!.\n";
}
elsif ($type eq 'perl') {
- my $run = "./perl $testswitch $switch $utf $test |";
+ my $perl = $ENV{PERL} || './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 |";
+ my $compile;
+ my $pl2c = "$testswitch -I../lib ../utils/perlcc --testsuite " .
+ # -O9 for good measure, -fcog is broken ATM
+ "$switch -Wb=-O9,-fno-cog -L .. " .
+ "-I \".. ../lib/CORE\" $args $utf $test -o ";
+
+ if( $^O eq 'MSWin32' ) {
+ $test_executable = "$test.exe";
+ # hopefully unused name...
+ open HACK, "> xweghyz.pl";
+ print HACK <<EOT;
+#!./perl
+
+open HACK, '.\\perl $pl2c $test_executable |';
+# cl.exe prints the name of the .c file on stdout (\%^\$^#)
+while(<HACK>) {m/^\w+\.[cC]\$/ && next;print}
+open HACK, '$test_executable |';
+while(<HACK>) {print}
+EOT
+ close HACK;
+ $compile = 'xweghyz.pl |';
+ }
+ else {
+ $test_executable = "$test.plc";
+ $compile = "./perl $pl2c $test_executable && $test_executable |";
+ }
+ unlink $test_executable if -f $test_executable;
open(RESULTS, $compile)
or print "can't compile '$compile': $!.\n";
- unlink "$test.plc";
}
- $ok = 0;
- $next = 0;
+ $ok = 0;
+ $next = 0;
while (<RESULTS>) {
if ($verbose) {
print $_;
$ok = 1;
}
else {
- if (/^(not )?ok (\d+)(\s*#.*)?/ &&
+ if (/^(not )?ok (\d+)[^#]*(\s*#.*)?/ &&
$2 == $next)
{
my($not, $num, $extra) = ($1, $2, $3);
}
if ($ENV{PERL_3LOG}) {
my $tpp = $test;
+ $tpp =~ s:^../::;
$tpp =~ s:/:_:g;
$tpp =~ s:\.t$::;
- rename("perl.3log", "perl.3log.$tpp");
+ rename("perl.3log", "perl.3log.$tpp") ||
+ die "rename: perl3.log to perl.3log.$tpp: $!\n";
}
$next = $next - 1;
- if ($ok && $next == $max) {
+ # test if the compiler compiled something
+ if( $type eq 'compile' && !-e "$test_executable" ) {
+ $ok = 0;
+ print "Test did not compile\n";
+ }
+ if ($ok && $next == $max ) {
if ($max) {
print "ok\n";
$good = $good + 1;
else {
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
- ### 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
+ warn <<'SHRDLU_1';
+ ### 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".
+SHRDLU_1
+ warn <<'SHRDLU_2' if $good / $total > 0.8;
+ ### You have a good chance to get more information by running
### ./perl harness
- ### in directory ./t.
-SHRDLU
+ ### in the 't' directory since most (>=80%) of the tests succeeded.
+SHRDLU_2
+ if (eval {require Config; import Config; 1}) {
+ if ($Config{usedl} && (my $p = $Config{ldlibpthname})) {
+ warn <<SHRDLU_3;
+ ### You may have to set your dynamic library search path,
+ ### $p, to point to the build directory:
+SHRDLU_3
+ if (exists $ENV{$p} && $ENV{$p} ne '') {
+ warn <<SHRDLU_4a;
+ ### setenv $p `pwd`:\$$p; cd t; ./perl harness
+ ### $p=`pwd`:\$$p; export $p; cd t; ./perl harness
+ ### export $p=`pwd`:\$$p; cd t; ./perl harness
+SHRDLU_4a
+ } else {
+ warn <<SHRDLU_4b;
+ ### setenv $p `pwd`; cd t; ./perl harness
+ ### $p=`pwd`; export $p; cd t; ./perl harness
+ ### export $p=`pwd`; cd t; ./perl harness
+SHRDLU_4b
+ }
+ warn <<SHRDLU_5;
+ ### for csh-style shells, like tcsh; or for traditional/modern
+ ### Bourne-style shells, like bash, ksh, and zsh, respectively.
+SHRDLU_5
+ }
+ }
}
($user,$sys,$cuser,$csys) = times;
print sprintf("u=%g s=%g cu=%g cs=%g scripts=%d tests=%d\n",