X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2FTEST;h=c601e45977bbd531ead7a6f69d780e91adb68c0f;hb=6d7e4387f586ed0a50c72bc4a94d68216f838d91;hp=8f60c8701c346c1aadf5fc1ae5fee0a2e586e1dc;hpb=809908f73d9628084b79065572fded532bb1d9f8;p=p5sagit%2Fp5-mst-13.2.git diff --git a/t/TEST b/t/TEST index 8f60c87..c601e45 100755 --- a/t/TEST +++ b/t/TEST @@ -1,30 +1,50 @@ #!./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.) $| = 1; +# for testing TEST only +#BEGIN { require '../lib/strict.pm'; strict->import() }; +#BEGIN { require '../lib/warnings.pm'; warnings->import() }; + +# Let tests know they're running in the perl core. Useful for modules +# which live dual lives on CPAN. +$ENV{PERL_CORE} = 1; + +# 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. -if ($#ARGV >= 0) { +{ + my @argv = (); foreach my $idx (0..$#ARGV) { - next unless $ARGV[$idx] =~ /^-(\S+)$/; - $verbose = 1 if $1 eq 'v'; - $with_utf= 1 if $1 eq 'utf8'; + 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'; + $::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; } - splice(@ARGV, $idx, 1); } + @ARGV = @argv; } chdir 't' if -f 't/TEST'; die "You need to run \"make test\" first to set things up.\n" - unless -e 'perl' or -e 'perl.exe'; + unless -e 'perl' or -e 'perl.exe' or -e 'perl.pm'; -if ($ENV{PERL_3LOG}) { +if ($ENV{PERL_3LOG}) { # Tru64 third(1) tool, see perlhack unless (-x 'perl.third') { unless (-x '../perl.third') { die "You need to run \"make perl.third first.\n"; @@ -44,81 +64,181 @@ $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; +if ($show_elapsed_time) { require Time::HiRes } my $curdir = File::Spec->curdir; my $updir = File::Spec->updir; sub _find_tests { my($dir) = @_; - opendir DIR, $dir || die "Trouble opening $dir: $!"; - foreach my $f (readdir DIR) { - next if $f eq $curdir or $f eq $updir; + 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)$/; - my $fullpath = File::Spec->catdir($dir, $f); + my $fullpath = File::Spec->catfile($dir, $f); - _find_tests($fullpath) if -d $fullpath; - push @ARGV, $fullpath if $f =~ /\.t$/; + _find_tests($fullpath) if -d $fullpath; + $fullpath = VMS::Filespec::unixify($fullpath) if $^O eq 'VMS'; + push @ARGV, $fullpath if $f =~ /\.t$/; } } -unless (@ARGV) { - foreach my $dir (qw(base comp cmd run io op pragma lib pod)) { - _find_tests($dir); +sub _quote_args { + my ($args) = @_; + my $argstring = ''; + + foreach (split(/\s+/,$args)) { + # In VMS protect with doublequotes because otherwise + # DCL will lowercase -- unless already doublequoted. + $_ = q(").$_.q(") if ($^O eq 'VMS') && !/^\"/ && length($_) > 0; + $argstring .= ' ' . $_; } + return $argstring; } -# %infinite = ( 'comp/require.t', 1, 'op/bop.t', 1, 'lib/hostname.t', 1 ); -%infinite = (); - -if ($deparse) { - _testprogs('deparse', @ARGV); -} else { - _testprogs('perl', @ARGV); - _testprogs('compile', @ARGV) if (-e "../testcompile"); +sub _populate_hash { + return map {$_, 1} split /\s+/, $_[0]; } -sub _testprogs { - $type = shift @_; - @tests = @_; +unless (@ARGV) { + foreach my $dir (qw(base comp cmd run io op uni)) { + _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 = File::Spec->catfile($updir, "config.sh"); + my %skip; + if (-f $configsh) { + my (%extensions, %known_extensions); + open FH, $configsh or die "Can't open $configsh: $!"; + while () { + if (/^extensions=['"](.*)['"]$/) { + # Deliberate string interpolation to avoid triggering possible + # $1 resetting bugs. + %extensions = _populate_hash ("$1"); + } + elsif (/^known_extensions=['"](.*)['"]$/) { + %known_extensions = _populate_hash ($1); + } + } + if (%extensions) { + if (%known_extensions) { + foreach (keys %known_extensions) { + $skip{$_}++ unless $extensions{$_}; + } + } else { + warn "No known_extensions line found in $configsh"; + } + } else { + warn "No extensions line found in $configsh"; + } + } + my $mani = File::Spec->catfile($updir, "MANIFEST"); + if (open(MANI, $mani)) { + my $ext_pat = $^O eq 'MSWin32' ? '(?:win32/)?ext' : 'ext'; + while () { # similar code in t/harness + if (m!^($ext_pat/(\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 $path = File::Spec->catfile($updir, $t); + push @ARGV, $path; + $::path_to_name{$path} = $t; + } + } + } + close MANI; + } else { + warn "$0: cannot open $mani: $!\n"; + } + unless ($::core) { + _find_tests('pod'); + _find_tests('x2p'); + _find_tests('japh') if $::torture; + } +} +if ($::deparse) { + _testprogs('deparse', '', @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 () { + print U pack("$f*", unpack("C*", $_)); + } + close(U); + } + close(A); + } + } + _testprogs('perl', '', @UARGV); + unlink(@UARGV); + } + } +} +else { + _testprogs('perl', '', @ARGV); +} - print <<'EOT' if ($type eq 'compile'); --------------------------------------------------------------------------------- -TESTING COMPILER --------------------------------------------------------------------------------- -EOT +sub _testprogs { + my ($type, $args, @tests) = @_; print <<'EOT' if ($type eq 'deparse'); --------------------------------------------------------------------------------- +------------------------------------------------------------------------------ TESTING DEPARSER --------------------------------------------------------------------------------- +------------------------------------------------------------------------------ EOT - $ENV{PERLCC_TIMEOUT} = 120 - if ($type eq 'compile' && !$ENV{PERLCC_TIMEOUT}); - - $bad = 0; - $good = 0; - $total = @tests; - $files = 0; - $totmax = 0; - $maxlen = 0; - foreach (@tests) { - $len = length; + $::bad_files = 0; + + foreach my $t (@tests) { + unless (exists $::path_to_name{$t}) { + my $tname = File::Spec->catfile('t',$t); + $tname = VMS::Filespec::unixify($tname) if $^O eq 'VMS'; + $::path_to_name{$t} = $tname; + } + } + my $maxlen = 0; + 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" - # -2 : the .t suffix - $dotdotdot = $maxlen + 3 - 2; - while ($test = shift @tests) { - - if ( $infinite{$test} && $type eq 'compile' ) { - print STDERR "$test creates infinite loop! Skipping.\n"; - next; - } + # + 3 : we want three dots between the test name and the "ok" + my $dotdotdot = $maxlen + 3 ; + my $valgrind = 0; + my $valgrind_log = 'current.valgrind'; + 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 ($test =~ /^$/) { next; } @@ -127,27 +247,40 @@ EOT # Redefinition happens at compile time next; } - elsif ($test eq "lib/switch.t") { + elsif ($test =~ m{lib/Switch/t/}) { # B::Deparse doesn't support source filtering next; } } - $te = $test; - chop($te); - print "$te" . '.' x ($dotdotdot - length($te)); + 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 = ''; + } + + # XXX DAPM %OVER not defined anywhere + # $test = $OVER{$test} if exists $OVER{$test}; - open(SCRIPT,"<$test") or die "Can't run $test.\n"; + open(SCRIPT,"<",$test) or die "Can't run $test.\n"; $_ =