if ($#ARGV >= 0) {
foreach my $idx (0..$#ARGV) {
next unless $ARGV[$idx] =~ /^-(\S+)$/;
+ $core = 1 if $1 eq 'core';
$verbose = 1 if $1 eq 'v';
$with_utf= 1 if $1 eq 'utf8';
if ($1 =~ /^deparse(,.+)?$/) {
}
unless (@ARGV) {
- foreach my $dir (qw(base comp cmd run io op pragma lib pod)) {
+ foreach my $dir (qw(base comp cmd run io op)) {
_find_tests($dir);
}
+ _find_tests("lib") unless $core;
my $mani = File::Spec->catdir($updir, "MANIFEST");
if (open(MANI, $mani)) {
- while (<MANI>) {
- if (m!^((?:ext|lib)/.+/(?:t/.+\.t)|test.pl)\s!) {
- push @ARGV, $1;
- $OVER{$1} = File::Spec->catdir($updir, $1);
+ while (<MANI>) { # similar code in t/harness
+ if (m!^(ext/\S+/([^/]+\.t|test\.pl)|lib/\S+?(\.t|test\.pl))\s!) {
+ $t = $1;
+ if (!$core || $t =~ m!^lib/[a-z]!)
+ {
+ $path = File::Spec->catdir($updir, $t);
+ push @ARGV, $path;
+ $name{$path} = $t;
+ }
}
}
} else {
warn "$0: cannot open $mani: $!\n";
}
+ _find_tests('pod');
}
# Tests known to cause infinite loops for the perlcc tests.
$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;
- chop($te);
+ $te = $name{$test};
print "$te" . '.' x ($dotdotdot - length($te));
$test = $OVER{$test} if exists $OVER{$test};
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 {
$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) {
### 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
+ ### Since most tests were successful you have a good chance
+ ### to get information better granularity by running
### ./perl harness
- ### in directory ./t.
+ ### in the 't' directory.
+SHRDLU
+ use Config;
+ if ($Config{ldlibpthname}) {
+ warn <<SHRDLU;
+ ### Since you seem to have a dynamic library search path,
+ ### $Config{ldlibpthname}, you probably should set that
+ ### to point to the build directory before running the harness.
+ ### Depending on your shell style:
+ ### setenv $Config{ldlibpthname} `pwd`; cd t; ./perl harness
+ ### $Config{ldlibpthname}=`pwd`; export $Config{ldlibpthname}; cd t; ./perl harness
+ ### export $Config{ldlibpthname}=`pwd`; cd t; ./perl harness
+ ### for csh-style shells, like tcsh; or for traditional/modern
+ ### Bourne-style shells, like bash, ksh, and zsh, respectively.
SHRDLU
+ }
}
($user,$sys,$cuser,$csys) = times;
print sprintf("u=%g s=%g cu=%g cs=%g scripts=%d tests=%d\n",