-#!./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;
# And skip even running these
my $deparse_skips;
+my $deparse_skip_file = '../Porting/deparse-skips.txt';
+
# directories with special sets of test switches
my %dir_to_switch =
(base => '',
'../cpan/CPAN' => 1,
'../cpan/Devel-PPPort' => 1,
'../cpan/Encode' => 1,
- '../cpan/ExtUtils-Command' => 1,
'../cpan/ExtUtils-Constant' => 1,
'../cpan/ExtUtils-Install' => 1,
'../cpan/ExtUtils-MakeMaker' => 1,
'../cpan/Locale-Codes' => 1,
'../cpan/Module-Load' => 1,
'../cpan/Module-Load-Conditional' => 1,
- '../cpan/Parse-CPAN-Meta' => 1,
'../cpan/Pod-Simple' => 1,
'../cpan/Test-Simple' => 1,
'../cpan/podlators' => 1,
'../cpan/IO-Compress' => 1,
'../cpan/MIME-Base64' => 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/Unicode-Collate' => 1,
- '../cpan/Unicode-Normalize' => 1,
+ '../dist/Unicode-Normalize' => 1,
);
+# temporary workaround Apr 2017. These need '.' in @INC.
+# Ideally this # list will eventually be empty
+
+my %temp_needs_dot = map { $_ => 1 } qw(
+ ../cpan/ExtUtils-Install
+ ../cpan/Filter-Util-Call
+ ../cpan/libnet
+ ../cpan/Locale-Codes
+ ../cpan/Math-BigInt
+ ../cpan/Math-BigRat
+ ../cpan/Test-Harness
+ ../cpan/Test-Simple
+ ../cpan/version
+);
+
+
# delete env vars that may influence the results
# but allow override via *_TEST env var if wanted
# (e.g. PERL5OPT_TEST=-d:NYTProf)
'.svn' => 1,
);
+
+if ($::do_nothing) {
+ return 1;
+}
+
$| = 1;
# for testing TEST only
# 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]);
-}
+# String eval to avoid loading File::Glob on non-miniperl.
+# (Windows only uses this script for miniperl.)
+@ARGV = eval 'map glob, @ARGV' if $^O eq 'MSWin32';
+
+our $show_elapsed_time = $ENV{HARNESS_TIMER} || 0;
# Cheesy version of Getopt::Std. We can't replace it with that, because we
# can't rely on require working.
@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';
}
-die "You need to run \"make test\" first to set things up.\n"
+die "You need to run \"make test_prep\" first to set things up.\n"
unless -e 'perl' or -e 'perl.exe' or -e 'perl.pm';
# check leakage for embedders
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) {
close $script;
- my $perl = './perl';
+ my $perl = $^O eq 'MSWin32' ? '.\perl' : './perl';
my $lib = '../lib';
my $run_dir;
my $return_dir;
if ($temp_no_core{$run_dir}) {
$testswitch = $testswitch . ',NC';
}
+ if($temp_needs_dot{$run_dir}) {
+ $testswitch = $testswitch . ',DOT';
+ }
}
} elsif ($test =~ m!^\.\./lib!) {
$testswitch = '-I.. -MTestInit=U1'; # -T will remove . from @INC
if (m!^((?:cpan|dist|ext)/(\S+)/+(?:[^/\s]+\.t|test\.pl)|lib/\S+?(?:\.t|test\.pl))\s!) {
my $t = $1;
my $extension = $2;
+
+ # XXX Generates way too many error lines currently. Skip for
+ # v5.22
+ next if $t =~ /^cpan/ && ord("A") != 65;
+
if (!$::core || $t =~ m!^lib/[a-z]!) {
if (defined $extension) {
$extension =~ s!/t(:?/\S+)*$!!;
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 @unexpected_pass; # files where deparse-skips.txt says fail but passed
my $toolnm; # valgrind, cachegrind, perf
while (my $test = shift @tests) {
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
}
}
}
+ my @junk = <$results>; # dump remaining output to prevent SIGPIPE
+ # (so far happens only on os390)
close $results;
+ undef @junk;
- 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) {
# Wait, it didn't fail? Great news! Tell someone!
$failure = "FAILED--all tests passed but test should have failed";
+ push @unexpected_pass, $test;
} else {
# Bah, still failing. Mask it.
print "${te}skipped\n";
}
}
- if ($failure) {
+ if (defined $failure) {
print "${te}$failure\n";
$::bad_files = $::bad_files + 1;
if ($test =~ /^base/ && ! defined &DynaLoader::boot_DynaLoader) {
for my $test ( sort keys %failed_tests ) {
print "\t$test\n";
}
+
+ if (@unexpected_pass) {
+ print <<EOF;
+
+The following scripts were expected to fail under -deparse (at least
+according to $deparse_skip_file), but unexpectedly succeeded:
+EOF
+ print "\t$_\n" for sort @unexpected_pass;
+ print "\n";
+ }
+
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.
}
}
}
+ 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,
}
# Generate regexps of known bad filenames / skips from Porting/deparse-skips.txt
-my $in;
sub _process_deparse_config {
my @deparse_failures;
my @deparse_skips;
- my $f = '../Porting/deparse-skips.txt';
+ my $f = $deparse_skip_file;
my $skips;
if (!open($skips, '<', $f)) {
return;
}
+ my $in;
while(<$skips>) {
if (/__DEPARSE_FAILURES__/) {
$in = \@deparse_failures; next;
next unless $_;
push @$in, $_;
+ warn "WARNING: $f:$.: excluded file doesn't exist: $_\n" unless -f $_;
}
for my $f (@deparse_failures, @deparse_skips) {
https://perl5.git.perl.org / perl5.git / blobdiff