-#!./perl -w
+#!./perl
# 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
# In which case, we need to stop t/TEST actually running tests, as all
# t/harness needs are its subroutines.
+# Measure the elapsed wallclock time.
+my $t0 = time();
+
# If we're doing deparse tests, ignore failures for these
my $deparse_failures;
'.svn' => 1,
);
+
+if ($::do_nothing) {
+ return 1;
+}
+
$| = 1;
# for testing TEST only
#BEGIN { require '../lib/strict.pm'; "strict"->import() };
#BEGIN { require '../lib/warnings.pm'; "warnings"->import() };
-# allow setting -options from env
-unshift @ARGV, split /;/, $ENV{TEST_OPTS} if $ENV{TEST_OPTS};
-
# 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;
-{ # create timestamp for any reports written, so theyre corelatable
- my @dt = localtime;
- $dt[5] += 1900; $dt[4] += 1; # fix year, month
- $::tstamp = sprintf("%d-%.2d%.2d-%.2d%.2d-%.2d-$$", @dt[5,4,3,2,1,0]);
-}
-
-# wrapper template for linux perf
-our %cmdwrap = (
- tool => "perf", # path
- cmd => "stat", # others possible, none tried
- rptdir => $ENV{PWD}, # typically ./t, better if absolute
- name => "", # $::tstamp prefixed implicitly
- # reps => 1 #
- opts => "", # pass-thru to perf stat: 'opts=-x,' gives CSV
- );
-
# Cheesy version of Getopt::Std. We can't replace it with that, because we
# can't rely on require working.
{
my @argv = ();
foreach my $idx (0..$#ARGV) {
- push( @argv, $ARGV[$idx] ), next unless $ARGV[$idx] =~ /^-(\S+?)(?:=(.+))?$/;
+ push( @argv, $ARGV[$idx] ), next unless $ARGV[$idx] =~ /^-(\S+)$/;
$::benchmark = 1 if $1 eq 'benchmark';
$::core = 1 if $1 eq 'core';
$::verbose = 1 if $1 eq 'v';
$::deparse_opts = $1;
_process_deparse_config();
}
- if ($1 eq 'lxperf') {
- die "perf only available on linux" unless $^O eq 'linux';
- $::perf = 1;
- next unless $2;
- # $2 is either Reps or : delimited $k=$v pairs
- my (@v) = split /:/, $2;
- $cmdwrap{reps} = $v[0] if @v == 1 and $v[0] =~ /^\d+$/;
- # parse as $k=$v to override %cmdwrap defaults
- m/(.+?)=(.+)/ and $cmdwrap{$1} = $2 for @v;
- }
}
@ARGV = @argv;
}
-if ($::do_nothing || $::do_nothing) { # set by harness b4 requiring us
- return 1;
-}
-
chdir 't' if -f 't/TEST';
if (-f 'TEST' && -f 'harness' && -d '../lib') {
@INC = '../lib';
my %timings = (); # testname => [@et] pairs if $show_elapsed_time.
# Roll your own File::Find!
-our @found;
-sub _find_tests { @found = (); push @ARGV, _find_files('\.t$', $_[0]) }
+sub _find_tests { our @found=(); push @ARGV, _find_files('\.t$', $_[0]) }
sub _find_files {
my($patt, @dirs) = @_;
for my $dir (@dirs) {
}
$perl = "$valgrind_exe $vg_opts $perl";
}
- if ($::perf) {
- my $ofile = "$cmdwrap{rptdir}/$::tstamp$cmdwrap{name}.perf";
- my $wrapper = "$cmdwrap{tool} $cmdwrap{cmd} "
- . ( defined $cmdwrap{reps} && $cmdwrap{reps} > 0
- ? "--repeat $cmdwrap{reps}" : "" )
- . " --append -o $ofile $cmdwrap{opts} -- ";
- $perl = "$wrapper $perl";
- }
my $args = "$options->{testswitch} $options->{switch} $options->{utf8}";
$cmd = $perl . _quote_args($args) . " $test $redir";
my $grind_ct = 0; # count of non-empty valgrind reports
my $total_files = @tests;
my $good_files = 0;
- my $tested_files = 0;
+ my $tested_files = 0;
my $totmax = 0;
my %failed_tests;
my $toolnm; # valgrind, cachegrind, perf
my $results = _run_test($test, $type);
- my $failure = "";
- my $next = 0; # ++ after each ok M
- my $seen_leader = 0; # set after "1..N"
- my $seen_ok = 0; # set after "ok M"
- my $trailing_leader = 0; # set after "1..N" if $seen_ok
- my $max; # set to N after "1..N"
+ my $failure;
+ my $next = 0;
+ my $seen_leader = 0;
+ my $seen_ok = 0;
+ my $trailing_leader = 0;
+ my $max;
my %todo;
while (<$results>) {
next if /^\s*$/; # skip blank lines
}
close $results;
- if (not $failure) {
+ if (not defined $failure) {
$failure = 'FAILED--no leader found' unless $seen_leader;
}
if ($type eq 'deparse' && !$ENV{KEEP_DEPARSE_FILES}) {
unlink "./$test.dp";
}
- if (not $failure and $next != $max) {
+ if (not defined $failure and $next != $max) {
$failure="FAILED--expected $max tests, saw $next";
}
- if (not $failure and $? ) { # don't mask a test failure
+ if( !defined $failure # don't mask a test failure
+ and $? )
+ {
$failure = "FAILED--non-zero wait status: $?";
}
}
}
- if ($failure) {
+ if (defined $failure) {
print "${te}$failure\n";
$::bad_files = $::bad_files + 1;
if ($test =~ /^base/ && ! defined &DynaLoader::boot_DynaLoader) {
}
}
}
+ printf "Elapsed: %d sec\n", time() - $t0;
my ($user,$sys,$cuser,$csys) = times;
my $tot = sprintf("u=%.2f s=%.2f cu=%.2f cs=%.2f scripts=%d tests=%d",
$user,$sys,$cuser,$csys,$tested_files,$totmax);
# relative path must account for that, ie ../../perf
# points to dir next to source tree.
require Storable;
- my $fn = "$show_elapsed_time/$::tstamp.ttimes";
+ 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,
https://perl5.git.perl.org / perl5.git / blobdiff