X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2FTEST;h=19f8fb1e6d31ac951639de376fd085439d5d6bde;hb=9b7091183a0e6b41a658e590f90e543efae3b2e4;hp=afce704b5379f56a08348e79143b2ae0481800d4;hpb=1de9afcdf18cf98bbdecaa782da93e907be6fe4e;p=p5sagit%2Fp5-mst-13.2.git diff --git a/t/TEST b/t/TEST index afce704..19f8fb1 100755 --- a/t/TEST +++ b/t/TEST @@ -5,38 +5,99 @@ # 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_utf8 = 1 if $1 eq 'utf8'; - $with_utf16 = 1 if $1 eq 'utf16'; - $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'; @@ -61,27 +122,196 @@ $ENV{PERL_DESTRUCT_LEVEL} = 2 unless exists $ENV{PERL_DESTRUCT_LEVEL}; $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 or - $f =~ /^(?:CVS|RCS|SCCS|\.svn)$/; + next if $skip{$f}; - my $fullpath = File::Spec->catfile($dir, $f); + my $fullpath = "$dir/$f"; - _find_tests($fullpath) if -d $fullpath; - $fullpath = VMS::Filespec::unixify($fullpath) if $^O eq 'VMS'; - push @ARGV, $fullpath if $f =~ /\.t$/; + 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 $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 $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 { my ($args) = @_; my $argstring = ''; @@ -95,49 +325,99 @@ 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 () { # 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 () { + 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); } - unless ($core) { + _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 () { + 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"; + } + } + # 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) { +elsif ($::with_utf16) { for my $e (0, 1) { for my $b (0, 1) { print STDERR "# ENDIAN $e BOM $b\n"; @@ -149,13 +429,13 @@ elsif ($with_utf16) { unlink($u); if (open(A, $a)) { if (open(U, ">$u")) { - print U pack("$f", 0xFEFF); + print U pack("$f", 0xFEFF) if $b; while () { print U pack("$f*", unpack("C*", $_)); } - close(A); + close(U); } - close(B); + close(A); } } _testprogs('perl', '', @UARGV); @@ -164,20 +444,11 @@ elsif ($with_utf16) { } } 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'); ------------------------------------------------------------------------------ @@ -185,44 +456,32 @@ TESTING DEPARSER ------------------------------------------------------------------------------ EOT - print <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; } @@ -236,188 +495,131 @@ EOT 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"; - $_ =