# This is written in a peculiar style, since we're trying to avoid
# most of the constructs we'll be testing for. (This comment is
-# probably obsolete on the avoidance side, though still currrent
+# probably obsolete on the avoidance side, though still current
# on the peculiarity side.)
# t/TEST and t/harness need to share code. The logical way to do this would be
'../ext/File-Glob/t' => '-I.. -MTestInit', # FIXME - tests assume t/
);
-# I think in the end I'd like "not absolute" to be the default", as it saves
-# some fakery within TestInit which can peturb tests, and takes CPU.
-my %no_abs =
- ('../ext/Pod-Parser' => 1,
- );
-
+# "not absolute" is the default, as it saves some fakery within TestInit
+# which can perturb 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-Tar' => 1,
+ '../cpan/AutoLoader' => 1,
+ '../cpan/CPAN' => 1,
+ '../cpan/Class-ISA' => 1,
+ '../cpan/Devel-PPPort' => 1,
+ '../cpan/Encode' => 1,
+ '../cpan/ExtUtils-Constant' => 1,
+ '../cpan/ExtUtils-MakeMaker' => 1,
+ '../cpan/File-Fetch' => 1,
+ '../cpan/IPC-Cmd' => 1,
+ '../cpan/IPC-SysV' => 1,
+ '../cpan/Locale-Codes' => 1,
+ '../cpan/Module-Build' => 1,
+ '../cpan/Module-Load' => 1,
+ '../cpan/Module-Load-Conditional' => 1,
+ '../cpan/Package-Constants' => 1,
+ '../cpan/Parse-CPAN-Meta' => 1,
+ '../cpan/Pod-Simple' => 1,
+ '../cpan/Test-Simple' => 1,
+ '../cpan/podlators' => 1,
+ '../dist/Cwd' => 1,
+ '../dist/ExtUtils-Command' => 1,
+ '../dist/ExtUtils-Install' => 1,
+ '../dist/ExtUtils-Manifest' => 1,
+ '../dist/ExtUtils-ParseXS' => 1,
+ '../dist/Tie-File' => 1,
+ );
+
my %temp_no_core =
- ('../ext/B-Debug' => 1,
- '../ext/Compress-Raw-Bzip2' => 1,
- '../ext/Compress-Raw-Zlib' => 1,
- '../ext/Devel-PPPort' => 1,
+ ('../cpan/B-Debug' => 1,
+ '../cpan/Compress-Raw-Bzip2' => 1,
+ '../cpan/Compress-Raw-Zlib' => 1,
+ '../cpan/Devel-PPPort' => 1,
'../cpan/Getopt-Long' => 1,
- '../ext/IO-Compress' => 1,
- '../cpan/IPC-SysV' => 1,
- '../ext/Math-BigInt' => 1,
- '../ext/Math-BigRat' => 1,
- '../ext/MIME-Base64' => 1,
- '../cpan/NEXT' => 1,
- '../ext/parent' => 1,
+ '../cpan/IO-Compress' => 1,
+ '../cpan/MIME-Base64' => 1,
+ '../cpan/parent' => 1,
'../cpan/Parse-CPAN-Meta' => 1,
- '../ext/Pod-Simple' => 1,
+ '../cpan/Pod-Simple' => 1,
'../cpan/podlators' => 1,
- '../ext/Test-Simple' => 1,
+ '../cpan/Test-Simple' => 1,
'../cpan/Tie-RefHash' => 1,
- '../ext/Time-HiRes' => 1,
- '../ext/Unicode-Collate' => 1,
- '../ext/Unicode-Normalize' => 1,
+ '../cpan/Unicode-Collate' => 1,
+ '../cpan/Unicode-Normalize' => 1,
);
+# delete env vars that may influence the results
+# but allow override via *_TEST env var if wanted
+# (e.g. PERL5OPT_TEST=-d:NYTProf)
+my @bad_env_vars = qw(
+ PERL5LIB PERLLIB PERL5OPT
+ PERL_YAML_BACKEND PERL_JSON_BACKEND
+);
+
+for my $envname (@bad_env_vars) {
+ my $override = $ENV{"${envname}_TEST"};
+ if (defined $override) {
+ warn "$0: $envname=$override\n";
+ $ENV{$envname} = $override;
+ }
+ else {
+ delete $ENV{$envname};
+ }
+}
+
if ($::do_nothing) {
return 1;
}
# Location to put the Valgrind log.
-my $Valgrind_Log = 'current.valgrind';
+our $Valgrind_Log;
$| = 1;
#BEGIN { require '../lib/strict.pm'; "strict"->import() };
#BEGIN { require '../lib/warnings.pm'; "warnings"->import() };
-delete $ENV{PERL5LIB};
-delete $ENV{PERLLIB};
-delete $ENV{PERL5OPT};
-
# remove empty elements due to insertion of empty symbols via "''p1'" syntax
@ARGV = grep($_,@ARGV) if $^O eq 'VMS';
our $show_elapsed_time = $ENV{HARNESS_TIMER} || 0;
$::with_utf8 = 1 if $1 eq 'utf8';
$::with_utf16 = 1 if $1 eq 'utf16';
$::taintwarn = 1 if $1 eq 'taintwarn';
- $ENV{PERL_CORE_MINITEST} = 1 if $1 eq 'minitest';
if ($1 =~ /^deparse(,.+)?$/) {
$::deparse = 1;
$::deparse_opts = $1;
# check leakage for embedders
$ENV{PERL_DESTRUCT_LEVEL} = 2 unless exists $ENV{PERL_DESTRUCT_LEVEL};
+# check existence of all symbols
+$ENV{PERL_DL_NONLAZY} = 1 unless exists $ENV{PERL_DL_NONLAZY};
$ENV{EMXSHELL} = 'sh'; # For OS/2
if ($show_elapsed_time) { require Time::HiRes }
+my %timings = (); # testname => [@et] pairs if $show_elapsed_time.
my %skip = (
'.' => 1,
);
# Roll your own File::Find!
-sub _find_tests {
- my($dir) = @_;
- opendir DIR, $dir or die "Trouble opening $dir: $!";
- foreach my $f (sort { $a cmp $b } readdir DIR) {
- next if $skip{$f};
-
- my $fullpath = "$dir/$f";
-
- if (-d $fullpath) {
- _find_tests($fullpath);
- } elsif ($f =~ /\.t$/) {
- push @ARGV, $fullpath;
+sub _find_tests { our @found=(); push @ARGV, _find_files('\.t$', $_[0]) }
+sub _find_files {
+ my($patt, @dirs) = @_;
+ for my $dir (@dirs) {
+ opendir DIR, $dir or die "Trouble opening $dir: $!";
+ foreach my $f (sort { $a cmp $b } readdir DIR) {
+ next if $skip{$f};
+
+ my $fullpath = "$dir/$f";
+
+ if (-d $fullpath) {
+ _find_files($patt, $fullpath);
+ } elsif ($f =~ /$patt/) {
+ push @found, $fullpath;
+ }
}
}
+ @found;
}
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!^(\.\./(?:cpan|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";
- if (!$no_abs{$run_dir}) {
- $testswitch = $testswitch . ',A';
- }
- if ($temp_no_core{$run_dir}) {
- $testswitch = $testswitch . ',NC';
+ if ($2 eq 'cpan' || $2 eq 'dist') {
+ if($abs{$run_dir}) {
+ $testswitch = $testswitch . ',A';
+ }
+ if ($temp_no_core{$run_dir}) {
+ $testswitch = $testswitch . ',NC';
+ }
}
+ } elsif ($test =~ m!^\.\./lib!) {
+ $testswitch = '-I.. -MTestInit=U1'; # -T will remove . from @INC
} 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,
my $redir = $^O eq 'VMS' ? '2>&1' : '';
if ($ENV{PERL_VALGRIND}) {
- my $valgrind = $ENV{VALGRIND} // 'valgrind';
+ my $perl_supp = $options->{return_dir} ? "$options->{return_dir}/perl.supp" : "perl.supp";
+ my $valgrind_exe = $ENV{VALGRIND} // 'valgrind';
my $vg_opts = $ENV{VG_OPTS}
- // "--suppressions=perl.supp --leak-check=yes "
- . "--leak-resolution=high --show-reachable=yes "
- . "--num-callers=50";
- $perl = "$valgrind --log-fd=3 $vg_opts $perl";
+ // '--log-fd=3 '
+ . "--suppressions=$perl_supp --leak-check=yes "
+ . "--leak-resolution=high --show-reachable=yes "
+ . "--num-callers=50 --track-origins=yes";
+ $perl = "$valgrind_exe $vg_opts $perl";
$redir = "3>$Valgrind_Log";
+ if ($options->{run_dir}) {
+ $Valgrind_Log = "$options->{run_dir}/$Valgrind_Log";
+ }
}
my $args = "$options->{testswitch} $options->{switch} $options->{utf8}";
$cmd = $perl . _quote_args($args) . " $test $redir";
}
-
return $cmd;
}
# 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!^((?:cpan|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]!) {
if (defined $extension) {
- $extension =~ s!/t$!!;
+ $extension =~ s!/t(:?/\S+)*$!!;
# XXX Do I want to warn that I'm skipping these?
next if $skip{$extension};
my $flat_extension = $extension;
# then comp, to validate that require works
# then run, to validate that -M works
# then we know we can -MTestInit for everything else, making life simpler
- foreach my $dir (qw(base comp run cmd io re op uni mro)) {
+ foreach my $dir (qw(base comp run cmd io re opbasic op uni mro)) {
_find_tests($dir);
}
- _find_tests("lib") unless $::core;
+ unless ($::core) {
+ _find_tests('porting');
+ _find_tests("lib");
+ }
# Config.pm may be broken for make minitest. And this is only a refinement
# for skipping tests on non-default builds, so it is allowed to fail.
# What we want to to is make a list of extensions which we did not build.
# 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;
_find_tests('t/benchmark') if $::benchmark or $ENV{PERL_BENCHMARK};
+ _find_tests('bigmem') if $ENV{PERL_TEST_MEMORY};
}
}
}
my $maxlen = 0;
foreach (@::path_to_name{@tests}) {
- s/\.\w+\z/./;
+ s/\.\w+\z/ /; # space gives easy doubleclick to select fname
my $len = length ;
$maxlen = $len if $len > $maxlen;
}
# + 3 : we want three dots between the test name and the "ok"
my $dotdotdot = $maxlen + 3 ;
- my $valgrind = 0;
+ my $grind_ct = 0; # count of non-empty valgrind reports
my $total_files = @tests;
my $good_files = 0;
my $tested_files = 0;
my $totmax = 0;
my %failed_tests;
+ my $toolnm; # valgrind, cachegrind, perf
while (my $test = shift @tests) {
- my $test_start_time = $show_elapsed_time ? Time::HiRes::time() : 0;
-
+ my ($test_start_time, @starttimes) = 0;
+ if ($show_elapsed_time) {
+ $test_start_time = Time::HiRes::time();
+ # times() reports usage by TEST, but we want usage of each
+ # testprog it calls, so record accumulated times now,
+ # subtract them out afterwards. Ideally, we'd take times
+ # in BEGIN/END blocks (giving better visibility of self vs
+ # children of each testprog), but that would require some
+ # IPC to send results back here, or a completely different
+ # collection scheme (Storable isn't tuned for incremental use)
+ @starttimes = times;
+ }
if ($test =~ /^$/) {
next;
}
}
}
my $te = $::path_to_name{$test} . '.'
- x ($dotdotdot - length($::path_to_name{$test}));
+ x ($dotdotdot - length($::path_to_name{$test})) .' ';
if ($^O ne 'VMS') { # defer printing on VMS due to piping bug
print $te;
$te = '';
}
+ (local $Valgrind_Log = "$test.valgrind-current") =~ s/^.*\///;
my $results = _run_test($test, $type);
my $failure;
next if /^\s*$/; # skip blank lines
if (/^1..$/ && ($^O eq 'VMS')) {
# VMS pipe bug inserts blank lines.
- my $l2 = <RESULTS>;
+ my $l2 = <$results>;
if ($l2 =~ /^\s*$/) {
- $l2 = <RESULTS>;
+ $l2 = <$results>;
}
$_ = '1..' . $l2;
}
}
$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.pm
+ # http://testanything.org/wiki/index.php/TAP_specification
$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{PERL_VALGRIND}) {
- my @valgrind;
+ $toolnm = $ENV{VALGRIND};
+ $toolnm =~ s|.*/||; # keep basename
+ my @valgrind; # gets content of file
if (-e $Valgrind_Log) {
if (open(V, $Valgrind_Log)) {
@valgrind = <V>;
warn "$0: Failed to open '$Valgrind_Log': $!\n";
}
}
- if ($ENV{VG_OPTS} =~ /cachegrind/) {
- if (rename $Valgrind_Log, "$test.valgrind") {
- $valgrind++;
+ if ($ENV{VG_OPTS} =~ /(cachegrind)/ or $toolnm =~ /(perf)/) {
+ $toolnm = $1;
+ if ($toolnm eq 'perf') {
+ # append perfs subcommand, not just stat
+ my ($sub) = split /\s/, $ENV{VG_OPTS};
+ $toolnm .= "-$sub";
+ }
+ if (rename $Valgrind_Log, "$test.$toolnm") {
+ $grind_ct++;
} else {
- warn "$0: Failed to create '$test.valgrind': $!\n";
+ warn "$0: Failed to create '$test.$toolnm': $!\n";
}
}
elsif (@valgrind) {
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++;
+ $grind_ct = $grind_ct + 1;
} else {
warn "$0: Failed to create '$test.valgrind': $!\n";
}
if (defined $failure) {
print "${te}$failure\n";
- $::bad_files++;
- if ($test =~ /^base/) {
- die "Failed a basic test ($test) -- cannot continue.\n";
+ $::bad_files = $::bad_files + 1;
+ if ($test =~ /^base/ && ! defined &DynaLoader::boot_DynaLoader) {
+ # Die if running under minitest (no DynaLoader). Otherwise
+ # keep going, as we know that Perl basically works, or we
+ # would not have been able to actually compile it all the way.
+ die "Failed a basic test ($test) under minitest -- cannot continue.\n";
}
- ++$failed_tests{$test};
+ $failed_tests{$test} = 1;
}
else {
if ($max) {
- my $elapsed;
+ my ($elapsed, $etms) = ("", 0);
if ( $show_elapsed_time ) {
- $elapsed = sprintf( " %8.0f ms", (Time::HiRes::time() - $test_start_time) * 1000 );
- }
- else {
- $elapsed = "";
+ $etms = (Time::HiRes::time() - $test_start_time) * 1000;
+ $elapsed = sprintf(" %8.0f ms", $etms);
+
+ my (@endtimes) = times;
+ $endtimes[$_] -= $starttimes[$_] for 0..$#endtimes;
+ splice @endtimes, 0, 2; # drop self/harness times
+ $_ *= 1000 for @endtimes; # and scale to ms
+ $timings{$test} = [$etms,@endtimes];
+ $elapsed .= sprintf(" %5.0f ms", $_) for @endtimes;
}
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
}
}
my ($user,$sys,$cuser,$csys) = times;
- print sprintf("u=%.2f s=%.2f cu=%.2f cs=%.2f scripts=%d tests=%d\n",
- $user,$sys,$cuser,$csys,$tested_files,$totmax);
+ my $tot = sprintf("u=%.2f s=%.2f cu=%.2f cs=%.2f scripts=%d tests=%d",
+ $user,$sys,$cuser,$csys,$tested_files,$totmax);
+ print "$tot\n";
+ if ($good_files) {
+ if (-d $show_elapsed_time) {
+ # HARNESS_TIMER = <a-directory>. Save timings etc to
+ # storable file there. NB: the test cds to ./t/, so
+ # relative path must account for that, ie ../../perf
+ # points to dir next to source tree.
+ require Storable;
+ my @dt = localtime;
+ $dt[5] += 1900; $dt[4] += 1; # fix year, month
+ my $fn = "$show_elapsed_time/".join('-', @dt[5,4,3,2,1]).".ttimes";
+ Storable::store({ perf => \%timings,
+ gather_conf_platform_info(),
+ total => $tot,
+ }, $fn);
+ print "wrote storable file: $fn\n";
+ }
+ }
if ($ENV{PERL_VALGRIND}) {
- my $s = $valgrind == 1 ? '' : 's';
- print "$valgrind valgrind report$s created.\n", ;
+ my $s = $grind_ct == 1 ? '' : 's';
+ print "$grind_ct valgrind report$s created.\n", ;
+ if ($toolnm eq 'cachegrind') {
+ # cachegrind leaves a lot of cachegrind.out.$pid litter
+ # around the tree, find and delete them
+ unlink _find_files('cachegrind.out.\d+$',
+ qw ( ../t ../cpan ../ext ../dist/ ));
+ }
}
}
exit ($::bad_files != 0);
+# Collect platform, config data that should allow comparing
+# performance data between different machines. With enough data,
+# and/or clever statistical analysis, it should be possible to
+# determine the effect of config choices, more memory, etc
+
+sub gather_conf_platform_info {
+ # currently rather quick & dirty, and subject to change
+ # for both content and format.
+ require Config;
+ my (%conf, @platform) = ();
+ $conf{$_} = $Config::Config{$_} for
+ grep /cc|git|config_arg\d+/, keys %Config::Config;
+ if (-f '/proc/cpuinfo') {
+ open my $fh, '/proc/cpuinfo' or warn "$!: /proc/cpuinfo\n";
+ @platform = grep /name|cpu/, <$fh>;
+ chomp $_ for @platform;
+ }
+ unshift @platform, $^O;
+
+ return (
+ conf => \%conf,
+ platform => {cpu => \@platform,
+ mem => [ grep s/\s+/ /,
+ grep chomp, `free` ],
+ load => [ grep chomp, `uptime` ],
+ },
+ host => (grep chomp, `hostname -f`),
+ version => '0.03', # bump for conf, platform, or data collection changes
+ );
+}
+
# ex: set ts=8 sts=4 sw=4 noet:
https://perl5.git.perl.org / perl5.git / blobdiff