X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fharness;h=d5b2924a63e96bd83302b82f20b47613454c158d;hb=ac27d13b824657b726428f3a6a1d5b3a01df569e;hp=d5335e729605520550de168b2b84a15f5c057fde;hpb=7a3152049c3b11217c72b149c0293284b6993763;p=p5sagit%2Fp5-mst-13.2.git
diff --git a/t/harness b/t/harness
index d5335e7..d5b2924 100644
--- a/t/harness
+++ b/t/harness
@@ -5,15 +5,25 @@
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';
+
+my $torture; # torture testing?
use Test::Harness;
$Test::Harness::switches = ""; # Too much noise otherwise
-$Test::Harness::verbose = shift if @ARGV && $ARGV[0] eq '-v';
+$Test::Harness::Verbose++ while @ARGV && $ARGV[0] eq '-v' && shift;
+
+if ($ARGV[0] && $ARGV[0] eq '-torture') {
+ shift;
+ $torture = 1;
+}
+
+# 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(
@@ -29,68 +39,93 @@ $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";
}
+my @tests = ();
+
+# [.VMS]TEST.COM calls harness with empty arguments, so clean-up @ARGV
+@ARGV = grep $_ && length( $_ ) => @ARGV;
+
+sub _populate_hash {
+ return map {$_, 1} split /\s+/, $_[0];
+}
+
+if ($ARGV[0] && $ARGV[0]=~/^-re/) {
+ if ($ARGV[0]!~/=/) {
+ shift;
+ $re=join "|",@ARGV;
+ @ARGV=();
+ } else {
+ (undef,$re)=split/=/,shift;
+ }
+}
+
if (@ARGV) {
- @tests = @ARGV;
+ if ($^O eq 'MSWin32') {
+ @tests = map(glob($_),@ARGV);
+ }
+ else {
+ @tests = @ARGV;
+ }
} else {
- @tests = unless @tests;
- use File::Spec;
- my $updir = File::Spec->updir;
- my $mani = File::Spec->catdir(File::Spec->updir, "MANIFEST");
- if (open(MANI, $mani)) {
- while () {
- if (m!^((?:ext|lib)/.+/t/[^/]+\.t)\s!) {
- push @tests, File::Spec->catdir($updir, $1);
+ unless (@tests) {
+ push @tests, ;
+ push @tests, ;
+ push @tests, ;
+ push @tests, ;
+ push @tests, ;
+ push @tests, ;
+ push @tests, ;
+ push @tests, ;
+ push @tests, ;
+ push @tests, if $torture;
+ push @tests, if $^O eq 'MSWin32';
+ use Config;
+ my %skip;
+ {
+ my %extensions = _populate_hash $Config{'extensions'};
+ my %known_extensions = _populate_hash $Config{'known_extensions'};
+ foreach (keys %known_extensions) {
+ $skip{$_}++ unless $extensions{$_};
}
}
- } else {
- warn "$0: cannot open $mani: $!\n";
+ use File::Spec;
+ my $updir = File::Spec->updir;
+ my $mani = File::Spec->catfile(File::Spec->updir, "MANIFEST");
+ if (open(MANI, $mani)) {
+ my @manitests = ();
+ my $ext_pat = $^O eq 'MSWin32' ? '(?:win32/)?ext' : 'ext';
+ while () { # similar code in t/TEST
+ if (m!^($ext_pat/(\S+)/+(?:[^/\s]+\.t|test\.pl)|lib/\S+?(?:\.t|test\.pl))\s!) {
+ my ($test, $extension) = ($1, $2);
+ if (defined $extension) {
+ $extension =~ s!/t$!!;
+ # XXX Do I want to warn that I'm skipping these?
+ next if $skip{$extension};
+ }
+ push @manitests, File::Spec->catfile($updir, $test);
+ }
+ }
+ close MANI;
+ # Sort the list of test files read from MANIFEST into a sensible
+ # order instead of using the order in which they are listed there
+ push @tests, sort { lc $a cmp lc $b } @manitests;
+ } else {
+ warn "$0: cannot open $mani: $!\n";
+ }
+ push @tests, ;
+ push @tests, ;
+ push @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
-# );
-
-my $dhwrapper = <<'EOT';
-open DATA,"<".__FILE__;
-until (($_=) =~ /^__END__/) {};
-EOT
-
-@tests = grep (!$infinite{$_}, @tests);
-@tests = map {
- my $new = $_;
- if ($datahandle{$_} && !( -f "$new.t") ) {
- $new .= '.t';
- local(*F, *T);
- open(F,"<$_") or die "Can't open $_: $!";
- open(T,">$new") or die "Can't open $new: $!";
- print T $dhwrapper, ;
- close F;
- close T;
- }
- $new;
- } @tests;
-
-print "The tests ", join(' ', keys(%infinite)),
- " generate infinite loops! Skipping!\n";
-
-$ENV{'HARNESS_COMPILE_TEST'} = 1;
-$ENV{'PERLCC_TIMEOUT'} = 120 unless $ENV{'PERLCC_TIMEOUT'};
-
-Test::Harness::runtests @tests;
-foreach (keys %datahandle) {
- unlink "$_.t";
+if ($^O eq 'MSWin32') {
+ s,\\,/,g for @tests;
}
+@tests=grep /$re/, @tests
+ if $re;
+Test::Harness::runtests @tests;
+exit(0);