X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2FTEST;h=38afe6f6910fe05d6d30fcd9b184b8a9e7c54076;hb=784fea9c399df2b90bca112fecf00acbb3989212;hp=e4550439425541aeb90fb38937dd31a218088d02;hpb=6ff868eed1e3e3c48a498103d08c46492bb90e3e;p=p5sagit%2Fp5-mst-13.2.git diff --git a/t/TEST b/t/TEST index e455043..38afe6f 100755 --- a/t/TEST +++ b/t/TEST @@ -1,29 +1,45 @@ #!./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; +# 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'; + # Cheesy version of Getopt::Std. Maybe we should replace it with that. +@argv = (); if ($#ARGV >= 0) { foreach my $idx (0..$#ARGV) { - next unless $ARGV[$idx] =~ /^-(\S+)$/; + push( @argv, $ARGV[$idx] ), next unless $ARGV[$idx] =~ /^-(\S+)$/; $core = 1 if $1 eq 'core'; $verbose = 1 if $1 eq 'v'; - $with_utf= 1 if $1 eq 'utf8'; + $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'; + $ENV{PERL_CORE_MINITEST} = 1 if $1 eq 'minitest'; if ($1 =~ /^deparse(,.+)?$/) { $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}) { # Tru64 third(1) tool, see perlhack unless (-x 'perl.third') { @@ -53,38 +69,99 @@ my $updir = File::Spec->updir; sub _find_tests { my($dir) = @_; - opendir DIR, $dir || die "Trouble opening $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 $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; + $fullpath = VMS::Filespec::unixify($fullpath) if $^O eq 'VMS'; push @ARGV, $fullpath if $f =~ /\.t$/; } } +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; +} + +sub _populate_hash { + return map {$_, 1} split /\s+/, $_[0]; +} + unless (@ARGV) { - foreach my $dir (qw(base comp cmd run io op)) { + foreach my $dir (qw(base comp cmd run io op uni)) { _find_tests($dir); } _find_tests("lib") unless $core; - my $mani = File::Spec->catdir($updir, "MANIFEST"); + # 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)) { while () { # similar code in t/harness - if (m!^(ext/\S+/([^/]+\.t|test\.pl)|lib/\S+?(\.t|test\.pl))\s!) { + if (m!^(ext/(\S+)/+(?:[^/\s]+\.t|test\.pl)|lib/\S+?(?:\.t|test\.pl))\s!) { $t = $1; + $extension = $2; if (!$core || $t =~ m!^lib/[a-z]!) { - push @ARGV, $t; - $OVER{$t} = File::Spec->catdir($updir, $t); + if (defined $extension) { + $extension =~ s!/t$!!; + # XXX Do I want to warn that I'm skipping these? + next if $skip{$extension}; + } + $path = File::Spec->catfile($updir, $t); + push @ARGV, $path; + $name{$path} = $t; } } } + close MANI; } else { warn "$0: cannot open $mani: $!\n"; } - _find_tests('pod'); + unless ($core) { + _find_tests('pod'); + _find_tests('x2p'); + _find_tests('japh') if $torture; + } } # Tests known to cause infinite loops for the perlcc tests. @@ -92,14 +169,48 @@ unless (@ARGV) { %infinite = (); if ($deparse) { - _testprogs('deparse', @ARGV); -} else { - _testprogs('perl', @ARGV); - _testprogs('compile', @ARGV) if (-e "../testcompile"); + _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 () { + print U pack("$f*", unpack("C*", $_)); + } + close(A); + } + close(B); + } + } + _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'); @@ -114,6 +225,12 @@ TESTING DEPARSER ------------------------------------------------------------------------------ EOT + print <catfile('t',$t); + $tname = VMS::Filespec::unixify($tname) if $^O eq 'VMS'; + $name{$t} = $tname; + } + } my $maxlen = 0; - my $maxsuflen = 0; - foreach (@tests) { # The same code in lib/Test/Harness.pm:_run_all_tests - my $suf = /\.(\w+)$/ ? $1 : ''; - my $len = length; - my $suflen = length $suf; - $maxlen = $len if $len > $maxlen; - $maxsuflen = $suflen if $suflen > $maxsuflen; + foreach (@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 - $maxsuflen; + $dotdotdot = $maxlen + 3 ; + my $valgrind = 0; + my $valgrind_log = 'current.valgrind'; while ($test = shift @tests) { if ( $infinite{$test} && $type eq 'compile' ) { @@ -147,31 +271,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; - $te =~ s/\.\w+$/./; - print "$te" . '.' x ($dotdotdot - length($te)); + $te = $name{$test} . '.' x ($dotdotdot - length($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"; - $_ =