#!./perl
# This is written in a peculiar style, since we're trying to avoid
-# most of the constructs we'll be testing for.
+# most of the constructs we'll be testing for. (This comment is
+# probably obsolete on the avoidance side, though still currrent
+# on the peculiarity side.)
+
+# t/TEST and t/harness need to share code. The logical way to do this would be
+# to have the common code in a file both require or use. However, t/TEST needs
+# to still work, to generate test results, even if require isn't working, so
+# we cannot do that. t/harness has no such restriction, so it is quite
+# acceptable to have it require t/TEST.
+
+# In which case, we need to stop t/TEST actually running tests, as all
+# t/harness needs are its subroutines.
+
+
+# directories with special sets of test switches
+my %dir_to_switch =
+ (base => '',
+ comp => '',
+ run => '',
+ '../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,
+ );
+
+my %temp_no_core =
+ ('../ext/B-Debug' => 1,
+ '../ext/Compress-Raw-Bzip2' => 1,
+ '../ext/Compress-Raw-Zlib' => 1,
+ '../cpan/Devel-PPPort' => 1,
+ '../cpan/Getopt-Long' => 1,
+ '../ext/IO-Compress' => 1,
+ '../ext/Math-BigInt' => 1,
+ '../ext/Math-BigRat' => 1,
+ '../ext/MIME-Base64' => 1,
+ '../cpan/NEXT' => 1,
+ '../ext/parent' => 1,
+ '../cpan/Parse-CPAN-Meta' => 1,
+ '../ext/Pod-Simple' => 1,
+ '../cpan/podlators' => 1,
+ '../ext/Test-Simple' => 1,
+ '../cpan/Tie-RefHash' => 1,
+ '../ext/Time-HiRes' => 1,
+ '../ext/Unicode-Collate' => 1,
+ '../ext/Unicode-Normalize' => 1,
+ );
+
+if ($::do_nothing) {
+ return 1;
+}
+
+# Location to put the Valgrind log.
+my $Valgrind_Log = 'current.valgrind';
$| = 1;
-# Let tests know they're running in the perl core. Useful for modules
-# which live dual lives on CPAN.
-$ENV{PERL_CORE} = 1;
+# for testing TEST only
+#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;
-# Cheesy version of Getopt::Std. Maybe we should replace it with that.
-@argv = ();
-if ($#ARGV >= 0) {
+# 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+)$/;
- $core = 1 if $1 eq 'core';
- $verbose = 1 if $1 eq 'v';
- $torture = 1 if $1 eq 'torture';
- $with_utf= 1 if $1 eq 'utf8';
- $bytecompile = 1 if $1 eq 'bytecompile';
- $compile = 1 if $1 eq 'compile';
- $taintwarn = 1 if $1 eq 'taintwarn';
+ $::benchmark = 1 if $1 eq 'benchmark';
+ $::core = 1 if $1 eq 'core';
+ $::verbose = 1 if $1 eq 'v';
+ $::torture = 1 if $1 eq 'torture';
+ $::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;
+ $::deparse = 1;
+ $::deparse_opts = $1;
}
}
+ @ARGV = @argv;
}
-@ARGV = @argv;
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"
unless -e 'perl' or -e 'perl.exe' or -e 'perl.pm';
$ENV{EMXSHELL} = 'sh'; # For OS/2
-# Roll your own File::Find!
-use TestInit;
-use File::Spec;
-my $curdir = File::Spec->curdir;
-my $updir = File::Spec->updir;
+if ($show_elapsed_time) { require Time::HiRes }
+my %skip = (
+ '.' => 1,
+ '..' => 1,
+ 'CVS' => 1,
+ 'RCS' => 1,
+ 'SCCS' => 1,
+ '.svn' => 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 $f eq $curdir or $f eq $updir;
+ next if $skip{$f};
+
+ my $fullpath = "$dir/$f";
+
+ if (-d $fullpath) {
+ _find_tests($fullpath);
+ } elsif ($f =~ /\.t$/) {
+ push @ARGV, $fullpath;
+ }
+ }
+}
+
+
+# Scan the text of the test program to find switches and special options
+# we might need to apply.
+sub _scan_test {
+ my($test, $type) = @_;
+
+ open(my $script, "<", $test) or die "Can't read $test.\n";
+ my $first_line = <$script>;
+
+ $first_line =~ tr/\0//d if $::with_utf16;
+
+ my $switch = "";
+ if ($first_line =~ /#!.*\bperl.*\s-\w*([tT])/) {
+ $switch = "-$1";
+ } else {
+ if ($::taintwarn) {
+ # not all tests are expected to pass with this option
+ $switch = '-t';
+ } else {
+ $switch = '';
+ }
+ }
- my $fullpath = File::Spec->catfile($dir, $f);
+ my $file_opts = "";
+ if ($type eq 'deparse') {
+ # Look for #line directives which change the filename
+ while (<$script>) {
+ $file_opts .= ",-f$3$4"
+ if /^#\s*line\s+(\d+)\s+((\w+)|"([^"]+)")/;
+ }
+ }
- _find_tests($fullpath) if -d $fullpath;
- $fullpath = VMS::Filespec::unixify($fullpath) if $^O eq 'VMS';
- push @ARGV, $fullpath if $f =~ /\.t$/;
+ close $script;
+
+ my $perl = './perl';
+ my $lib = '../lib';
+ my $run_dir;
+ my $return_dir;
+
+ $test =~ /^(.+)\/[^\/]+/;
+ my $dir = $1;
+ my $testswitch = $dir_to_switch{$dir};
+ if (!defined $testswitch) {
+ 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';
+ }
+ } else {
+ $testswitch = '-I.. -MTestInit'; # -T will remove . from @INC
+ }
}
+
+ my $utf8 = $::with_utf8 ? "-I$lib -Mutf8" : '';
+
+ my %options = (
+ perl => $perl,
+ lib => $lib,
+ test => $test,
+ run_dir => $run_dir,
+ return_dir => $return_dir,
+ testswitch => $testswitch,
+ utf8 => $utf8,
+ file => $file_opts,
+ switch => $switch,
+ );
+
+ return \%options;
+}
+
+sub _cmd {
+ my($options, $type) = @_;
+
+ my $test = $options->{test};
+
+ my $cmd;
+ if ($type eq 'deparse') {
+ my $perl = "$options->{perl} $options->{testswitch}";
+ my $lib = $options->{lib};
+
+ $cmd = (
+ "$perl $options->{switch} -I$lib -MO=-qq,Deparse,-sv1.,".
+ "-l$::deparse_opts$options->{file} ".
+ "$test > $test.dp ".
+ "&& $perl $options->{switch} -I$lib $test.dp"
+ );
+ }
+ elsif ($type eq 'perl') {
+ my $perl = $options->{perl};
+ my $redir = $^O eq 'VMS' ? '2>&1' : '';
+
+ if ($ENV{PERL_VALGRIND}) {
+ my $valgrind = $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";
+ $redir = "3>$Valgrind_Log";
+ }
+
+ my $args = "$options->{testswitch} $options->{switch} $options->{utf8}";
+ $cmd = $perl . _quote_args($args) . " $test $redir";
+ }
+
+ return $cmd;
+}
+
+sub _before_fork {
+ my ($options) = @_;
+
+ if ($options->{run_dir}) {
+ my $run_dir = $options->{run_dir};
+ chdir $run_dir or die "Can't chdir to '$run_dir': $!";
+ }
+
+ return;
+}
+
+sub _after_fork {
+ my ($options) = @_;
+
+ if ($options->{return_dir}) {
+ my $return_dir = $options->{return_dir};
+ chdir $return_dir
+ or die "Can't chdir from '$options->{run_dir}' to '$return_dir': $!";
+ }
+
+ return;
+}
+
+sub _run_test {
+ my ($test, $type) = @_;
+
+ my $options = _scan_test($test, $type);
+ # $test might have changed if we're in ext/Foo, so don't use it anymore
+ # from now on. Use $options->{test} instead.
+
+ _before_fork($options);
+
+ my $cmd = _cmd($options, $type);
+
+ open(my $results, "$cmd |") or print "can't run '$cmd': $!.\n";
+
+ _after_fork($options);
+
+ # Our environment may force us to use UTF-8, but we can't be sure that
+ # anything we're reading from will be generating (well formed) UTF-8
+ # This may not be the best way - possibly we should unset ${^OPEN} up
+ # top?
+ binmode $results;
+
+ return $results;
}
sub _quote_args {
return $argstring;
}
-unless (@ARGV) {
- foreach my $dir (qw(base comp cmd run io op uni)) {
- _find_tests($dir);
+sub _populate_hash {
+ return unless defined $_[0];
+ return map {$_, 1} split /\s+/, $_[0];
+}
+
+sub _tests_from_manifest {
+ my ($extensions, $known_extensions) = @_;
+ my %skip;
+ my %extensions = _populate_hash($extensions);
+ my %known_extensions = _populate_hash($known_extensions);
+
+ foreach (keys %known_extensions) {
+ $skip{$_}++ unless $extensions{$_};
}
- _find_tests("lib") unless $core;
- my $mani = File::Spec->catfile($updir, "MANIFEST");
+
+ my @results;
+ my $mani = '../MANIFEST';
if (open(MANI, $mani)) {
- while (<MANI>) { # similar code in t/harness
- if (m!^(ext/\S+/?(?:[^/\s]+\.t|test\.pl)|lib/\S+?(?:\.t|test\.pl))\s!) {
- $t = $1;
- if (!$core || $t =~ m!^lib/[a-z]!)
- {
- $path = File::Spec->catfile($updir, $t);
- push @ARGV, $path;
- $name{$path} = $t;
+ while (<MANI>) {
+ 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$!!;
+ # XXX Do I want to warn that I'm skipping these?
+ next if $skip{$extension};
+ my $flat_extension = $extension;
+ $flat_extension =~ s!-!/!g;
+ next if $skip{$flat_extension}; # Foo/Bar may live in Foo-Bar
+ }
+ my $path = "../$t";
+ push @results, $path;
+ $::path_to_name{$path} = $t;
}
}
}
close MANI;
} else {
- warn "$0: cannot open $mani: $!\n";
+ warn "$0: cannot open $mani: $!\n";
+ }
+ return @results;
+}
+
+unless (@ARGV) {
+ # base first, as TEST bails out if that can't run
+ # 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)) {
+ _find_tests($dir);
+ }
+ _find_tests("lib") unless $::core;
+ # 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.
+ my $configsh = '../config.sh';
+ my ($extensions, $known_extensions);
+ if (-f $configsh) {
+ open FH, $configsh or die "Can't open $configsh: $!";
+ while (<FH>) {
+ if (/^extensions=['"](.*)['"]$/) {
+ $extensions = $1;
+ }
+ elsif (/^known_extensions=['"](.*)['"]$/) {
+ $known_extensions = $1;
+ }
+ }
+ if (!defined $known_extensions) {
+ warn "No known_extensions line found in $configsh";
+ }
+ if (!defined $extensions) {
+ warn "No extensions line found in $configsh";
+ }
}
- unless ($core) {
+ # The "complex" constructions of list return from a subroutine, and push of
+ # a list, might fail if perl is really hosed, but they aren't needed for
+ # make minitest, and the building of extensions will likely also fail if
+ # something is that badly wrong.
+ push @ARGV, _tests_from_manifest($extensions, $known_extensions);
+ unless ($::core) {
_find_tests('pod');
_find_tests('x2p');
- _find_tests('japh') if $torture;
+ _find_tests('porting');
+ _find_tests('japh') if $::torture;
+ _find_tests('t/benchmark') if $::benchmark or $ENV{PERL_BENCHMARK};
}
}
-# Tests known to cause infinite loops for the perlcc tests.
-# %infinite = ( 'comp/require.t', 1, 'op/bop.t', 1, 'lib/hostname.t', 1 );
-%infinite = ();
-
-if ($deparse) {
+if ($::deparse) {
_testprogs('deparse', '', @ARGV);
}
-elsif( $compile ) {
- _testprogs('compile', '', @ARGV);
-}
-elsif( $bytecompile ) {
- _testprogs('bytecompile', '', @ARGV);
+elsif ($::with_utf16) {
+ for my $e (0, 1) {
+ for my $b (0, 1) {
+ print STDERR "# ENDIAN $e BOM $b\n";
+ my @UARGV;
+ for my $a (@ARGV) {
+ my $u = $a . "." . ($e ? "l" : "b") . "e" . ($b ? "b" : "");
+ my $f = $e ? "v" : "n";
+ push @UARGV, $u;
+ unlink($u);
+ if (open(A, $a)) {
+ if (open(U, ">$u")) {
+ print U pack("$f", 0xFEFF) if $b;
+ while (<A>) {
+ print U pack("$f*", unpack("C*", $_));
+ }
+ close(U);
+ }
+ close(A);
+ }
+ }
+ _testprogs('perl', '', @UARGV);
+ unlink(@UARGV);
+ }
+ }
}
else {
- _testprogs('compile', '', @ARGV) if -e "../testcompile";
_testprogs('perl', '', @ARGV);
}
sub _testprogs {
- $type = shift @_;
- $args = shift;
- @tests = @_;
-
- print <<'EOT' if ($type eq 'compile');
-------------------------------------------------------------------------------
-TESTING COMPILER
-------------------------------------------------------------------------------
-EOT
+ my ($type, $args, @tests) = @_;
print <<'EOT' if ($type eq 'deparse');
------------------------------------------------------------------------------
------------------------------------------------------------------------------
EOT
- print <<EOT if ($type eq 'bytecompile');
-------------------------------------------------------------------------------
-TESTING BYTECODE COMPILER
-------------------------------------------------------------------------------
-EOT
-
- $ENV{PERLCC_TIMEOUT} = 120
- if ($type eq 'compile' && !$ENV{PERLCC_TIMEOUT});
-
- $bad = 0;
- $good = 0;
- $total = @tests;
- $files = 0;
- $totmax = 0;
+ $::bad_files = 0;
foreach my $t (@tests) {
- unless (exists $name{$t}) {
- my $tname = File::Spec->catfile('t',$t);
- $tname = VMS::Filespec::unixify($tname) if $^O eq 'VMS';
- $name{$t} = $tname;
+ unless (exists $::path_to_name{$t}) {
+ my $tname = "t/$t";
+ $::path_to_name{$t} = $tname;
}
}
my $maxlen = 0;
- foreach (@name{@tests}) {
+ foreach (@::path_to_name{@tests}) {
s/\.\w+\z/./;
my $len = length ;
$maxlen = $len if $len > $maxlen;
}
# + 3 : we want three dots between the test name and the "ok"
- $dotdotdot = $maxlen + 3 ;
+ my $dotdotdot = $maxlen + 3 ;
my $valgrind = 0;
- my $valgrind_log = 'current.valgrind';
- while ($test = shift @tests) {
+ my $total_files = @tests;
+ my $good_files = 0;
+ my $tested_files = 0;
+ my $totmax = 0;
+ my %failed_tests;
+
+ while (my $test = shift @tests) {
+ my $test_start_time = $show_elapsed_time ? Time::HiRes::time() : 0;
- if ( $infinite{$test} && $type eq 'compile' ) {
- print STDERR "$test creates infinite loop! Skipping.\n";
- next;
- }
if ($test =~ /^$/) {
next;
}
next;
}
}
- $te = $name{$test} . '.' x ($dotdotdot - length($name{$test}));
+ my $te = $::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 = '';
}
- $test = $OVER{$test} if exists $OVER{$test};
-
- open(SCRIPT,"<$test") or die "Can't run $test.\n";
- $_ = <SCRIPT>;
- close(SCRIPT) unless ($type eq 'deparse');
- if (/#!.*\bperl.*\s-\w*([tT])/) {
- $switch = qq{"-$1"};
- }
- else {
- if ($taintwarn) {
- # not all tests are expected to pass with this option
- $switch = '"-t"';
- }
- else {
- $switch = '';
- }
- }
-
- my $test_executable; # for 'compile' tests
- my $file_opts = "";
- if ($type eq 'deparse') {
- # Look for #line directives which change the filename
- while (<SCRIPT>) {
- $file_opts .= ",-f$3$4"
- if /^#\s*line\s+(\d+)\s+((\w+)|"([^"]+)")/;
- }
- close(SCRIPT);
- }
-
- my $utf = $with_utf ? '-I../lib -Mutf8' : '';
- my $testswitch = '-I. -MTestInit'; # -T will strict . from @INC
- if ($type eq 'deparse') {
- my $deparse =
- "./perl $testswitch $switch -I../lib -MO=-qq,Deparse,-sv1.,".
- "-l$deparse_opts$file_opts ".
- "$test > $test.dp ".
- "&& ./perl $testswitch $switch -I../lib $test.dp |";
- open(RESULTS, $deparse)
- or print "can't deparse '$deparse': $!.\n";
- }
- elsif ($type eq 'bytecompile') {
- my ($pwd, $null);
- if( $^O eq 'MSWin32') {
- $pwd = `cd`;
- $null = 'nul';
- } else {
- $pwd = `pwd`;
- $null = '/dev/null';
- }
- chomp $pwd;
- my $perl = $ENV{PERL} || "$pwd/perl";
- my $bswitch = "-MO=Bytecode,-H,-TI,-s$pwd/$test,";
- $bswitch .= "-TF$test.plc,"
- if $test =~ m(chdir|pod/|CGI/t/carp|lib/DB);
- $bswitch .= "-k,"
- if $test =~ m(deparse|terse|ext/Storable/t/code);
- $bswitch .= "-b,"
- if $test =~ m(op/getpid);
- my $bytecompile =
- "$perl $testswitch $switch -I../lib $bswitch".
- "-o$test.plc $test 2>$null &&".
- "$perl $testswitch $switch -I../lib $utf $test.plc |";
- open(RESULTS,$bytecompile)
- or print "can't byte-compile '$bytecompile': $!.\n";
- }
- elsif ($type eq 'perl') {
- my $perl = $ENV{PERL} || './perl';
- my $redir = $^O eq 'VMS' ? '2>&1' : '';
- if ($ENV{PERL_VALGRIND}) {
- $perl = "valgrind --suppressions=perl.supp --leak-check=yes "
- . "--leak-resolution=high --show-reachable=yes "
- . "--num-callers=50 --logfile-fd=3 $perl";
- $redir = "3>$valgrind_log";
- }
- my $run = "$perl" . _quote_args("$testswitch $switch $utf") . " $test $redir|";
- open(RESULTS,$run) or print "can't run '$run': $!.\n";
- }
- else {
- my $compile;
- my $pl2c = "$testswitch -I../lib ../utils/perlcc --testsuite " .
- # -O9 for good measure, -fcog is broken ATM
- "$switch -Wb=-O9,-fno-cog -L .. " .
- "-I \".. ../lib/CORE\" $args $utf $test -o ";
-
- if( $^O eq 'MSWin32' ) {
- $test_executable = "$test.exe";
- # hopefully unused name...
- open HACK, "> xweghyz.pl";
- print HACK <<EOT;
-#!./perl
+ my $results = _run_test($test, $type);
-open HACK, '.\\perl $pl2c $test_executable |';
-# cl.exe prints the name of the .c file on stdout (\%^\$^#)
-while(<HACK>) {m/^\\w+\\.[cC]\$/ && next;print}
-open HACK, '$test_executable |';
-while(<HACK>) {print}
-EOT
- close HACK;
- $compile = 'xweghyz.pl |';
- }
- else {
- $test_executable = "$test.plc";
- $compile = "./perl $pl2c $test_executable && $test_executable |";
- }
- unlink $test_executable if -f $test_executable;
- open(RESULTS, $compile)
- or print "can't compile '$compile': $!.\n";
- }
-
- $ok = 0;
- $next = 0;
- my $seen_leader = 0;
- my $seen_ok = 0;
- while (<RESULTS>) {
+ 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
- if ($verbose) {
+ if (/^1..$/ && ($^O eq 'VMS')) {
+ # VMS pipe bug inserts blank lines.
+ my $l2 = <RESULTS>;
+ if ($l2 =~ /^\s*$/) {
+ $l2 = <RESULTS>;
+ }
+ $_ = '1..' . $l2;
+ }
+ if ($::verbose) {
print $_;
}
unless (/^\#/) {
+ if ($trailing_leader) {
+ # shouldn't be anything following a postfix 1..n
+ $failure = 'FAILED--extra output after trailing 1..n';
+ last;
+ }
if (/^1\.\.([0-9]+)( todo ([\d ]+))?/) {
+ if ($seen_leader) {
+ $failure = 'FAILED--seen duplicate leader';
+ last;
+ }
$max = $1;
- %todo = map { $_ => 1 } split / /, $3 if $3;
+ %todo = map { $_ => 1 } split / /, $3 if $3;
$totmax += $max;
- $files += 1;
- unless ($seen_ok) {
- $next = 1;
- $ok = 1;
- }
- $seen_leader = 1;
+ $tested_files++;
+ if ($seen_ok) {
+ # 1..n appears at end of file
+ $trailing_leader = 1;
+ if ($next != $max) {
+ $failure = "FAILED--expected $max tests, saw $next";
+ last;
+ }
+ }
+ else {
+ $next = 0;
+ }
+ $seen_leader = 1;
}
else {
- if (/^(not )?ok (\d+)[^\#]*(\s*\#.*)?/) {
+ if (/^(not )?ok(?: (\d+))?[^\#]*(\s*\#.*)?/) {
unless ($seen_leader) {
unless ($seen_ok) {
- $next = 1;
- $ok = 1;
+ $next = 0;
}
}
$seen_ok = 1;
- if ($2 == $next) {
- my($not, $num, $extra) = ($1, $2, $3);
- my($istodo) = $extra =~ /#\s*TODO/ if $extra;
+ $next++;
+ my($not, $num, $extra, $istodo) = ($1, $2, $3, 0);
+ $num = $next unless $num;
+
+ if ($num == $next) {
+
+ # SKIP is essentially the same as TODO for t/TEST
+ # this still conforms to TAP:
+ # http://search.cpan.org/dist/TAP/TAP.pm
+ $extra and $istodo = $extra =~ /#\s*(?:TODO|SKIP)\b/;
$istodo = 1 if $todo{$num};
if( $not && !$istodo ) {
- $ok = 0;
- $next = $num;
+ $failure = "FAILED at test $num";
last;
}
- else {
- $next = $next + 1;
- }
}
- }
- elsif (/^Bail out!\s*(.*)/i) { # magic words
- die "FAILED--Further testing stopped" . ($1 ? ": $1\n" : ".\n");
+ else {
+ $failure ="FAILED--expected test $next, saw test $num";
+ last;
+ }
+ }
+ elsif (/^Bail out!\s*(.*)/i) { # magic words
+ die "FAILED--Further testing stopped" . ($1 ? ": $1\n" : ".\n");
}
else {
- $ok = 0;
+ # module tests are allowed extra output,
+ # because Test::Harness allows it
+ next if $test =~ /^\W*(cpan|dist|ext|lib)\b/;
+ $failure = "FAILED--unexpected output at test $next";
+ last;
}
}
}
}
- close RESULTS;
+ close $results;
+
+ if (not defined $failure) {
+ $failure = 'FAILED--no leader found' unless $seen_leader;
+ }
+
if ($ENV{PERL_VALGRIND}) {
my @valgrind;
- if (-e $valgrind_log) {
- if (open(V, $valgrind_log)) {
+ if (-e $Valgrind_Log) {
+ if (open(V, $Valgrind_Log)) {
@valgrind = <V>;
close V;
} else {
- warn "$0: Failed to open '$valgrind_log': $!\n";
+ warn "$0: Failed to open '$Valgrind_Log': $!\n";
}
}
- if (@valgrind) {
+ if ($ENV{VG_OPTS} =~ /cachegrind/) {
+ if (rename $Valgrind_Log, "$test.valgrind") {
+ $valgrind++;
+ } else {
+ warn "$0: Failed to create '$test.valgrind': $!\n";
+ }
+ }
+ elsif (@valgrind) {
my $leaks = 0;
my $errors = 0;
for my $i (0..$#valgrind) {
}
}
if ($errors or $leaks) {
- if (rename $valgrind_log, "$test.valgrind") {
+ if (rename $Valgrind_Log, "$test.valgrind") {
$valgrind++;
} else {
warn "$0: Failed to create '$test.valgrind': $!\n";
} else {
warn "No valgrind output?\n";
}
- if (-e $valgrind_log) {
- unlink $valgrind_log
- or warn "$0: Failed to unlink '$valgrind_log': $!\n";
+ if (-e $Valgrind_Log) {
+ unlink $Valgrind_Log
+ or warn "$0: Failed to unlink '$Valgrind_Log': $!\n";
}
}
if ($type eq 'deparse') {
rename("perl.3log", $tpp) ||
die "rename: perl3.log to $tpp: $!\n";
}
- $next = $next - 1;
- # test if the compiler compiled something
- if( $type eq 'compile' && !-e "$test_executable" ) {
- $ok = 0;
- print "Test did not compile\n";
- }
- if ($ok && $next == $max ) {
- if ($max) {
- print "${te}ok\n";
- $good = $good + 1;
- }
- else {
- print "${te}skipping test on this platform\n";
- $files -= 1;
+ if (not defined $failure and $next != $max) {
+ $failure="FAILED--expected $max tests, saw $next";
+ }
+
+ if( !defined $failure # don't mask a test failure
+ and $? )
+ {
+ $failure = "FAILED--non-zero wait status: $?";
+ }
+
+ if (defined $failure) {
+ print "${te}$failure\n";
+ $::bad_files++;
+ if ($test =~ /^base/) {
+ die "Failed a basic test ($test) -- cannot continue.\n";
}
+ ++$failed_tests{$test};
}
else {
- $next += 1;
- print "${te}FAILED at test $next\n";
- $bad = $bad + 1;
- $_ = $test;
- if (/^base/) {
- die "Failed a basic test--cannot continue.\n";
+ if ($max) {
+ my $elapsed;
+ if ( $show_elapsed_time ) {
+ $elapsed = sprintf( " %8.0f ms", (Time::HiRes::time() - $test_start_time) * 1000 );
+ }
+ else {
+ $elapsed = "";
+ }
+ print "${te}ok$elapsed\n";
+ $good_files++;
+ }
+ else {
+ print "${te}skipped\n";
+ $tested_files -= 1;
}
}
- }
+ } # while tests
- if ($bad == 0) {
- if ($ok) {
+ if ($::bad_files == 0) {
+ if ($good_files) {
print "All tests successful.\n";
# XXX add mention of 'perlbug -ok' ?
}
}
}
else {
- $pct = $files ? sprintf("%.2f", ($files - $bad) / $files * 100) : "0.00";
- if ($bad == 1) {
- warn "Failed 1 test script out of $files, $pct% okay.\n";
- }
- else {
- warn "Failed $bad test scripts out of $files, $pct% okay.\n";
+ my $pct = $tested_files ? sprintf("%.2f", ($tested_files - $::bad_files) / $tested_files * 100) : "0.00";
+ my $s = $::bad_files == 1 ? "" : "s";
+ warn "Failed $::bad_files test$s out of $tested_files, $pct% okay.\n";
+ for my $test ( sort keys %failed_tests ) {
+ print "\t$test\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.
### See the INSTALL document's section on "make test".
SHRDLU_1
- warn <<'SHRDLU_2' if $good / $total > 0.8;
+ warn <<'SHRDLU_2' if $good_files / $total_files > 0.8;
### You have a good chance to get more information by running
### ./perl harness
### in the 't' directory since most (>=80%) of the tests succeeded.
SHRDLU_2
- if (eval {require Config; import Config; 1}) {
- if ($Config{usedl} && (my $p = $Config{ldlibpthname})) {
+ if (eval {require Config; import Config; 1}) {
+ if ($::Config{usedl} && (my $p = $::Config{ldlibpthname})) {
warn <<SHRDLU_3;
### You may have to set your dynamic library search path,
### $p, to point to the build directory:
SHRDLU_3
- if (exists $ENV{$p} && $ENV{$p} ne '') {
+ if (exists $ENV{$p} && $ENV{$p} ne '') {
warn <<SHRDLU_4a;
### setenv $p `pwd`:\$$p; cd t; ./perl harness
### $p=`pwd`:\$$p; export $p; cd t; ./perl harness
### export $p=`pwd`:\$$p; cd t; ./perl harness
SHRDLU_4a
- } else {
+ } else {
warn <<SHRDLU_4b;
### setenv $p `pwd`; cd t; ./perl harness
### $p=`pwd`; export $p; cd t; ./perl harness
### export $p=`pwd`; cd t; ./perl harness
SHRDLU_4b
- }
+ }
warn <<SHRDLU_5;
### for csh-style shells, like tcsh; or for traditional/modern
### Bourne-style shells, like bash, ksh, and zsh, respectively.
SHRDLU_5
- }
+ }
}
}
- ($user,$sys,$cuser,$csys) = times;
- print sprintf("u=%g s=%g cu=%g cs=%g scripts=%d tests=%d\n",
- $user,$sys,$cuser,$csys,$files,$totmax);
+ 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);
if ($ENV{PERL_VALGRIND}) {
my $s = $valgrind == 1 ? '' : 's';
print "$valgrind valgrind report$s created.\n", ;
}
}
-exit ($bad != 0);
+exit ($::bad_files != 0);
+
+# ex: set ts=8 sts=4 sw=4 noet:
https://perl5.git.perl.org / perl5.git / blobdiff