'../ext/Compress-Raw-Bzip2' => 1,
'../ext/Compress-Raw-Zlib' => 1,
'../ext/Devel-PPPort' => 1,
- '../ext/Encode' => 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,
);
}
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';
}
}
- my $utf8 = $::with_utf8 ? '-I$lib -Mutf8' : '';
+ my $utf8 = $::with_utf8 ? "-I$lib -Mutf8" : '';
- return {
+ my %options = (
perl => $perl,
lib => $lib,
test => $test,
utf8 => $utf8,
file => $file_opts,
switch => $switch,
- };
+ );
+
+ return \%options;
}
sub _cmd {
}
sub _run_test {
- my($harness, $test, $type) = @_;
- if (!defined $type) {
- # To conform to the interface expected by exec in TAP::Harness
- $type = 'perl';
- }
+ my ($test, $type) = @_;
my $options = _scan_test($test, $type);
-
- $test = $options->{test}; # Might have changed if we're in ext/Foo
+ # $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);
$te = '';
}
- my $results = _run_test(undef, $test, $type);
+ my $results = _run_test($test, $type);
my $failure;
my $next = 0;