'../ext/File-Glob/t' => '-I.. -MTestInit', # FIXME - tests assume t/
);
+# "not absolute" is the the default, as it saves some fakery within TestInit
+# which can peturb tests, and takes CPU. Working with the upstream author of
+# any of these, to figure out how to remove them from this list, considered
+# "a good thing".
+my %abs = (
+ '../cpan/Archive-Extract' => 1,
+ '../cpan/Archive-Tar' => 1,
+ '../cpan/AutoLoader' => 1,
+ '../cpan/CPAN' => 1,
+ '../cpan/Class-ISA' => 1,
+ '../cpan/Cwd' => 1,
+ '../cpan/Devel-PPPort' => 1,
+ '../cpan/Encode' => 1,
+ '../cpan/ExtUtils-Command' => 1,
+ '../cpan/ExtUtils-Constant' => 1,
+ '../cpan/ExtUtils-MakeMaker' => 1,
+ '../cpan/ExtUtils-Manifest' => 1,
+ '../cpan/ExtUtils-ParseXS' => 1,
+ '../cpan/File-Fetch' => 1,
+ '../cpan/IPC-Cmd' => 1,
+ '../cpan/IPC-SysV' => 1,
+ '../cpan/Locale-Codes' => 1,
+ '../cpan/Log-Message' => 1,
+ '../cpan/Math-BigInt' => 1,
+ '../cpan/Math-BigRat' => 1,
+ '../cpan/Math-Complex' => 1,
+ '../cpan/Module-Build' => 1,
+ '../cpan/Module-Load' => 1,
+ '../cpan/Module-Load-Conditional' => 1,
+ '../cpan/Object-Accessor' => 1,
+ '../cpan/Package-Constants' => 1,
+ '../cpan/Parse-CPAN-Meta' => 1,
+ '../cpan/Pod-Simple' => 1,
+ '../cpan/Term-UI' => 1,
+ '../cpan/Test-Simple' => 1,
+ '../cpan/Tie-File' => 1,
+ '../cpan/bignum' => 1,
+ '../cpan/podlators' => 1,
+ '../dist/ExtUtils-Install' => 1,
+ );
+
my %temp_no_core =
- ('../ext/B-Debug' => 1,
- '../ext/Compress-Raw-Bzip2' => 1,
- '../ext/Compress-Raw-Zlib' => 1,
- '../ext/Devel-PPPort' => 1,
- '../ext/IO-Compress' => 1,
- '../ext/IPC-SysV' => 1,
- '../ext/Math-BigInt' => 1,
- '../ext/Math-BigRat' => 1,
- '../ext/MIME-Base64' => 1,
- '../ext/parent' => 1,
- '../ext/Parse-CPAN-Meta' => 1,
- '../ext/Tie-RefHash' => 1,
- '../ext/Time-HiRes' => 1,
- '../ext/Unicode-Normalize' => 1,
+ ('../cpan/B-Debug' => 1,
+ '../cpan/Compress-Raw-Bzip2' => 1,
+ '../cpan/Compress-Raw-Zlib' => 1,
+ '../cpan/Devel-PPPort' => 1,
+ '../cpan/Getopt-Long' => 1,
+ '../cpan/IO-Compress' => 1,
+ '../cpan/Math-BigInt' => 1,
+ '../cpan/Math-BigRat' => 1,
+ '../cpan/MIME-Base64' => 1,
+ '../cpan/NEXT' => 1,
+ '../cpan/parent' => 1,
+ '../cpan/Parse-CPAN-Meta' => 1,
+ '../cpan/Pod-Simple' => 1,
+ '../cpan/podlators' => 1,
+ '../cpan/Test-Simple' => 1,
+ '../cpan/Tie-RefHash' => 1,
+ '../cpan/Time-HiRes' => 1,
+ '../cpan/Unicode-Collate' => 1,
+ '../cpan/Unicode-Normalize' => 1,
);
if ($::do_nothing) {
if ($type eq 'deparse') {
# Look for #line directives which change the filename
while (<$script>) {
- $file_opts .= ",-f$3$4"
+ $file_opts = $file_opts . ",-f$3$4"
if /^#\s*line\s+(\d+)\s+((\w+)|"([^"]+)")/;
}
}
my $dir = $1;
my $testswitch = $dir_to_switch{$dir};
if (!defined $testswitch) {
- if ($test =~ s!^(\.\./ext/[^/]+)/t!t!) {
+ if ($test =~ s!^(\.\./(cpan|dist|ext)/[^/]+)/t!t!) {
$run_dir = $1;
$return_dir = '../../t';
$lib = '../../lib';
$perl = '../../t/perl';
- $testswitch = "-I../.. -MTestInit=U2T,A";
- if ($temp_no_core{$run_dir}) {
- $testswitch = $testswitch . ',NC';
+ $testswitch = "-I../.. -MTestInit=U2T";
+ if ($2 eq 'cpan' || $2 eq 'dist') {
+ if($abs{$run_dir}) {
+ $testswitch = $testswitch . ',A';
+ }
+ if ($temp_no_core{$run_dir}) {
+ $testswitch = $testswitch . ',NC';
+ }
}
} else {
$testswitch = '-I.. -MTestInit'; # -T will remove . from @INC
}
}
- my $utf8 = $::with_utf8 ? "-I$lib -Mutf8" : '';
+ my $utf8 = ($::with_utf8 || $::with_utf16) ? "-I$lib -Mutf8" : '';
my %options = (
perl => $perl,
# In VMS protect with doublequotes because otherwise
# DCL will lowercase -- unless already doublequoted.
$_ = q(").$_.q(") if ($^O eq 'VMS') && !/^\"/ && length($_) > 0;
- $argstring .= ' ' . $_;
+ $argstring = $argstring . ' ' . $_;
}
return $argstring;
}
my %known_extensions = _populate_hash($known_extensions);
foreach (keys %known_extensions) {
- $skip{$_}++ unless $extensions{$_};
+ $skip{$_} = 1 unless $extensions{$_};
}
my @results;
my $mani = '../MANIFEST';
if (open(MANI, $mani)) {
while (<MANI>) {
- if (m!^(ext/(\S+)/+(?:[^/\s]+\.t|test\.pl)|lib/\S+?(?:\.t|test\.pl))\s!) {
+ if (m!^((?:cpan|dist|ext)/(\S+)/+(?:[^/\s]+\.t|test\.pl)|lib/\S+?(?:\.t|test\.pl))\s!) {
my $t = $1;
my $extension = $2;
if (!$::core || $t =~ m!^lib/[a-z]!) {
# something is that badly wrong.
push @ARGV, _tests_from_manifest($extensions, $known_extensions);
unless ($::core) {
- _find_tests('pod');
_find_tests('x2p');
_find_tests('porting');
_find_tests('japh') if $::torture;
}
$max = $1;
%todo = map { $_ => 1 } split / /, $3 if $3;
- $totmax += $max;
- $tested_files++;
+ $totmax = $totmax + $max;
+ $tested_files = $tested_files + 1;
if ($seen_ok) {
# 1..n appears at end of file
$trailing_leader = 1;
}
}
$seen_ok = 1;
- $next++;
+ $next = $next + 1;
my($not, $num, $extra, $istodo) = ($1, $2, $3, 0);
$num = $next unless $num;
# SKIP is essentially the same as TODO for t/TEST
# this still conforms to TAP:
- # http://search.cpan.org/dist/TAP/TAP.pod
+ # http://search.cpan.org/dist/TAP/TAP.pm
$extra and $istodo = $extra =~ /#\s*(?:TODO|SKIP)\b/;
$istodo = 1 if $todo{$num};
else {
# module tests are allowed extra output,
# because Test::Harness allows it
- next if $test =~ /^\W*(ext|lib)\b/;
+ next if $test =~ /^\W*(cpan|dist|ext|lib)\b/;
$failure = "FAILED--unexpected output at test $next";
last;
}
}
if ($ENV{VG_OPTS} =~ /cachegrind/) {
if (rename $Valgrind_Log, "$test.valgrind") {
- $valgrind++;
+ $valgrind = $valgrind + 1;
} else {
warn "$0: Failed to create '$test.valgrind': $!\n";
}
for my $i (0..$#valgrind) {
local $_ = $valgrind[$i];
if (/^==\d+== ERROR SUMMARY: (\d+) errors? /) {
- $errors += $1; # there may be multiple error summaries
+ $errors = $errors + $1; # there may be multiple error summaries
} elsif (/^==\d+== LEAK SUMMARY:/) {
for my $off (1 .. 4) {
if ($valgrind[$i+$off] =~
/(?:lost|reachable):\s+\d+ bytes in (\d+) blocks/) {
- $leaks += $1;
+ $leaks = $leaks + $1;
}
}
}
}
if ($errors or $leaks) {
if (rename $Valgrind_Log, "$test.valgrind") {
- $valgrind++;
+ $valgrind = $valgrind + 1;
} else {
warn "$0: Failed to create '$test.valgrind': $!\n";
}
if (defined $failure) {
print "${te}$failure\n";
- $::bad_files++;
+ $::bad_files = $::bad_files + 1;
if ($test =~ /^base/) {
die "Failed a basic test ($test) -- cannot continue.\n";
}
- ++$failed_tests{$test};
+ $failed_tests{$test} = 1;
}
else {
if ($max) {
$elapsed = "";
}
print "${te}ok$elapsed\n";
- $good_files++;
+ $good_files = $good_files + 1;
}
else {
print "${te}skipped\n";
- $tested_files -= 1;
+ $tested_files = $tested_files - 1;
}
}
} # while tests
https://perl5.git.perl.org / perl5.git / blobdiff