# 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/
+ );
+
+my %temp_no_core =
+ ('../ext/B-Debug' => 1,
+ '../ext/Compress-Raw-Bzip2' => 1,
+ '../ext/Compress-Raw-Zlib' => 1,
+ '../ext/Devel-PPPort' => 1,
+ '../ext/IO-Compress' => 1,
+ '../ext/IPC-SysV' => 1,
+ '../ext/MIME-Base64' => 1,
+ '../ext/Parse-CPAN-Meta' => 1,
+ '../ext/Time-HiRes' => 1,
+ '../ext/Unicode-Normalize' => 1,
+ );
+
+if ($::do_nothing) {
+ return 1;
+}
+
# Location to put the Valgrind log.
my $Valgrind_Log = 'current.valgrind';
#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;
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.
+# 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) {
}
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;
if ($show_elapsed_time) { require Time::HiRes }
my %skip = (
'.svn' => 1,
);
+# Roll your own File::Find!
sub _find_tests {
my($dir) = @_;
opendir DIR, $dir or die "Trouble opening $dir: $!";
my $switch = "";
if ($first_line =~ /#!.*\bperl.*\s-\w*([tT])/) {
- $switch = qq{"-$1"};
+ $switch = "-$1";
} else {
if ($::taintwarn) {
# not all tests are expected to pass with this option
- $switch = '"-t"';
+ $switch = '-t';
} else {
$switch = '';
}
}
}
- return { file => $file_opts, switch => $switch };
-}
-
+ 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!^(\.\./ext/[^/]+)/t!t!) {
+ $run_dir = $1;
+ $return_dir = '../../t';
+ $lib = '../../lib';
+ $perl = '../../t/perl';
+ $testswitch = "-I../.. -MTestInit=U2T,A";
+ if ($temp_no_core{$run_dir}) {
+ $testswitch = $testswitch . ',NC';
+ }
+ } else {
+ $testswitch = '-I.. -MTestInit'; # -T will remove . from @INC
+ }
+ }
-sub _run_test {
- my($test, $type) = @_;
+ 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;
+}
- my $options = _scan_test($test, $type);
+sub _cmd {
+ my($options, $type) = @_;
- my $utf8 = $::with_utf8 ? '-I../lib -Mutf8' : '';
- my $testswitch = '-I. -MTestInit'; # -T will strict . from @INC
+ my $test = $options->{test};
- my $results;
+ my $cmd;
if ($type eq 'deparse') {
- my $deparse_cmd =
- "./perl $testswitch $options->{switch} -I../lib -MO=-qq,Deparse,-sv1.,".
+ 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 $testswitch $options->{switch} -I../lib $test.dp |";
- open($results, $deparse_cmd)
- or print "can't deparse '$deparse_cmd': $!.\n";
+ "&& $perl $options->{switch} -I$lib $test.dp"
+ );
}
elsif ($type eq 'perl') {
- my $perl = $ENV{PERL} || './perl';
+ my $perl = $options->{perl};
my $redir = $^O eq 'VMS' ? '2>&1' : '';
if ($ENV{PERL_VALGRIND}) {
my $vg_opts = $ENV{VG_OPTS}
// "--suppressions=perl.supp --leak-check=yes "
. "--leak-resolution=high --show-reachable=yes "
- . "--num-callers=50";
+ . "--num-callers=50";
$perl = "$valgrind --log-fd=3 $vg_opts $perl";
$redir = "3>$Valgrind_Log";
}
- my $run = "$perl" . _quote_args("$testswitch $options->{switch} $utf8")
- . " $test $redir|";
- open($results, $run) or print "can't run '$run': $!.\n";
+ 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
}
sub _populate_hash {
+ return unless defined $_[0];
return map {$_, 1} split /\s+/, $_[0];
}
-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 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';
+sub _tests_from_manifest {
+ my ($extensions, $known_extensions) = @_;
my %skip;
- if (-f $configsh) {
- my (%extensions, %known_extensions);
- open FH, $configsh or die "Can't open $configsh: $!";
- while (<FH>) {
- 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 %extensions = _populate_hash($extensions);
+ my %known_extensions = _populate_hash($known_extensions);
+
+ foreach (keys %known_extensions) {
+ $skip{$_}++ unless $extensions{$_};
}
+
+ my @results;
my $mani = '../MANIFEST';
if (open(MANI, $mani)) {
- while (<MANI>) { # similar code in t/harness
+ while (<MANI>) {
if (m!^(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 (!$::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{$flat_extension}; # Foo/Bar may live in Foo-Bar
}
my $path = "../$t";
- push @ARGV, $path;
+ push @results, $path;
$::path_to_name{$path} = $t;
}
}
} else {
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 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";
+ }
+ }
+ # 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');
$te = '';
}
- # XXX DAPM %OVER not defined anywhere
- # $test = $OVER{$test} if exists $OVER{$test};
-
- my $results = _run_test($test, $type);
+ my $results = _run_test($test, $type);
my $failure;
my $next = 0;