# 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 =
'../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-Install' => 1,
'../cpan/ExtUtils-MakeMaker' => 1,
+ '../cpan/ExtUtils-Manifest' => 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/Devel-PPPort' => 1,
'../dist/ExtUtils-ParseXS' => 1,
'../dist/Tie-File' => 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)
# remove empty elements due to insertion of empty symbols via "''p1'" syntax
@ARGV = grep($_,@ARGV) if $^O eq 'VMS';
+
+# 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
if ($1 =~ /^deparse(,.+)?$/) {
$::deparse = 1;
$::deparse_opts = $1;
+ _process_deparse_config();
}
}
@ARGV = @argv;
@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
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+)*$!!;
# 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 opbasic op uni mro)) {
+ foreach my $dir (qw(base comp run cmd io re opbasic op uni mro perf)) {
_find_tests($dir);
}
unless ($::core) {
push @ARGV, _tests_from_manifest($extensions, $known_extensions);
unless ($::core) {
_find_tests('japh') if $::torture;
- _find_tests('t/benchmark') if $::benchmark or $ENV{PERL_BENCHMARK};
+ _find_tests('benchmark') if $::benchmark or $ENV{PERL_BENCHMARK};
_find_tests('bigmem') if $ENV{PERL_TEST_MEMORY};
}
}
+@ARGV= do {
+ my @order= (
+ "base",
+ "comp",
+ "run",
+ "cmd",
+ "io",
+ "re",
+ "opbasic",
+ "op",
+ "uni",
+ "mro",
+ "lib",
+ "ext",
+ "dist",
+ "cpan",
+ "perf",
+ "porting",
+ );
+ my %order= map { $order[$_] => 1+$_ } 0..$#order;
+ my $idx= 0;
+ map {
+ $_->[0]
+ } sort {
+ $a->[3] <=> $b->[3] ||
+ $a->[1] <=> $b->[1]
+ } map {
+ my $root= /(\w+)/ ? $1 : "";
+ [ $_, $idx++, $root, $order{$root}||=0 ]
+ } @ARGV;
+};
if ($::deparse) {
_testprogs('deparse', '', @ARGV);
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) {
if ($test =~ /^$/) {
next;
}
- if ($type eq 'deparse') {
- if ($test eq "comp/redef.t") {
- # Redefinition happens at compile time
- next;
- }
- elsif ($test =~ m{lib/Switch/t/}) {
- # B::Deparse doesn't support source filtering
- next;
- }
+ if ($type eq 'deparse' && $test =~ $deparse_skips) {
+ next;
}
my $te = $::path_to_name{$test} . '.'
x ($dotdotdot - length($::path_to_name{$test})) .' ';
}
}
}
+ my @junk = <$results>; # dump remaining output to prevent SIGPIPE
+ # (so far happens only on os390)
close $results;
+ undef @junk;
if (not defined $failure) {
$failure = 'FAILED--no leader found' unless $seen_leader;
_check_valgrind(\$toolnm, \$grind_ct, \$test);
- if ($type eq 'deparse') {
+ if ($type eq 'deparse' && !$ENV{KEEP_DEPARSE_FILES}) {
unlink "./$test.dp";
}
if (not defined $failure and $next != $max) {
$failure = "FAILED--non-zero wait status: $?";
}
+ # Deparse? Should it have passed or failed?
+ if ($type eq 'deparse' && $test =~ $deparse_failures) {
+ if (!$failure) {
+ # Wait, it didn't fail? Great news!
+ push @unexpected_pass, $test;
+ } else {
+ # Bah, still failing. Mask it.
+ print "${te}skipped\n";
+ $tested_files = $tested_files - 1;
+ next;
+ }
+ }
+
if (defined $failure) {
print "${te}$failure\n";
$::bad_files = $::bad_files + 1;
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);
}
}
+# Generate regexps of known bad filenames / skips from Porting/deparse-skips.txt
+
+sub _process_deparse_config {
+ my @deparse_failures;
+ my @deparse_skips;
+
+ my $f = $deparse_skip_file;
+
+ my $skips;
+ if (!open($skips, '<', $f)) {
+ warn "Failed to find $f: $!\n";
+ return;
+ }
+
+ my $in;
+ while(<$skips>) {
+ if (/__DEPARSE_FAILURES__/) {
+ $in = \@deparse_failures; next;
+ } elsif (/__DEPARSE_SKIPS__/) {
+ $in = \@deparse_skips; next;
+ } elsif (!$in) {
+ next;
+ }
+
+ s/#.*$//; # Kill comments
+ s/\s+$//; # And trailing whitespace
+
+ next unless $_;
+
+ push @$in, $_;
+ warn "WARNING: $f:$.: excluded file doesn't exist: $_\n" unless -f $_;
+ }
+
+ for my $f (@deparse_failures, @deparse_skips) {
+ if ($f =~ m|/$|) { # Dir? Skip everything below it
+ $f = qr/\Q$f\E.*/;
+ } else {
+ $f = qr/\Q$f\E/;
+ }
+ }
+
+ $deparse_failures = join('|', @deparse_failures);
+ $deparse_failures = qr/^(?:$deparse_failures)$/;
+
+ $deparse_skips = join('|', @deparse_skips);
+ $deparse_skips = qr/^(?:$deparse_skips)$/;
+}
+
# ex: set ts=8 sts=4 sw=4 noet:
https://perl5.git.perl.org / perl5.git / blobdiff