X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fharness;h=1a15ebcca252fcb2eb541c0f7a6762ceee6473f1;hb=436c6dd385a3b29cadf4fa091af1c55eed665e29;hp=c46a87090c432090e8ea02915dbf467c104be045;hpb=0ca044874fec3bf87bea6955f6263e103e6744a8;p=p5sagit%2Fp5-mst-13.2.git
diff --git a/t/harness b/t/harness
index c46a870..1a15ebc 100644
--- a/t/harness
+++ b/t/harness
@@ -5,16 +5,19 @@
BEGIN {
chdir 't' if -d 't';
- unshift @INC, '../lib';
+ @INC = '../lib'; # pick up only this build's lib
$ENV{PERL5LIB} = '../lib'; # so children will see it too
}
-use lib '../lib';
use Test::Harness;
$Test::Harness::switches = ""; # Too much noise otherwise
$Test::Harness::verbose = shift if @ARGV && $ARGV[0] eq '-v';
+# Let tests know they're running in the perl core. Useful for modules
+# which live dual lives on CPAN.
+$ENV{PERL_CORE} = 1;
+
#fudge DATA for now.
%datahandle = qw(
lib/bigint.t 1
@@ -29,25 +32,60 @@ $Test::Harness::verbose = shift if @ARGV && $ARGV[0] eq '-v';
op/runlevel.t 1
op/tie.t 1
op/lex_assign.t 1
- pragma/subs.t 1
);
foreach (keys %datahandle) {
unlink "$_.t";
}
-@tests = @ARGV;
-@tests = unless @tests;
+my @tests = ();
+if (@ARGV) {
+ if ($^O eq 'MSWin32') {
+ @tests = map(glob($_),@ARGV);
+ }
+ else {
+ @tests = @ARGV;
+ }
+} else {
+ unless (@tests) {
+ push @tests, ;
+ push @tests, ;
+ push @tests, ;
+ push @tests, ;
+ push @tests, ;
+ push @tests, ;
+ push @tests, ;
+ push @tests, ;
+ push @tests, if $^O eq 'MSWin32';
+ use File::Spec;
+ my $updir = File::Spec->updir;
+ my $mani = File::Spec->catfile(File::Spec->updir, "MANIFEST");
+ if (open(MANI, $mani)) {
+ while () { # similar code in t/TEST
+ if (m!^(ext/\S+/?([^/]+\.t|test\.pl)|lib/\S+?(\.t|test\.pl))\s!) {
+ push @tests, File::Spec->catfile($updir, $1);
+ }
+ }
+ close MANI;
+ } else {
+ warn "$0: cannot open $mani: $!\n";
+ }
+ push @tests, ;
+ }
+}
+if ($^O eq 'MSWin32') {
+ s,\\,/,g for @tests;
+}
Test::Harness::runtests @tests;
exit(0) unless -e "../testcompile";
-%infinite = qw (
- op/bop.t 1
- lib/hostname.t 1
- op/lex_assign.t 1
- lib/ph.t 1
- );
+# %infinite = qw (
+# op/bop.t 1
+# lib/hostname.t 1
+# op/lex_assign.t 1
+# lib/ph.t 1
+# );
my $dhwrapper = <<'EOT';
open DATA,"<".__FILE__;
@@ -57,7 +95,7 @@ EOT
@tests = grep (!$infinite{$_}, @tests);
@tests = map {
my $new = $_;
- if ($datahandle{$_} && !( -f $new.t) ) {
+ if ($datahandle{$_} && !( -f "$new.t") ) {
$new .= '.t';
local(*F, *T);
open(F,"<$_") or die "Can't open $_: $!";
@@ -72,10 +110,10 @@ EOT
print "The tests ", join(' ', keys(%infinite)),
" generate infinite loops! Skipping!\n";
-$ENV{'COMPILE_TEST'} = 1;
-$ENV{'COMPILE_TIMEOUT'} = 120 unless $ENV{'COMPILE_TIMEOUT'};
+$ENV{'HARNESS_COMPILE_TEST'} = 1;
+$ENV{'PERLCC_TIMEOUT'} = 120 unless $ENV{'PERLCC_TIMEOUT'};
-Test::Harness::runtests @tests;
+Test::Harness::runtests @tests;
foreach (keys %datahandle) {
unlink "$_.t";
}