X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fharness;h=b5e3e872f1b1126fb1014e82ba8d67f082385bfc;hb=02bc0c09b2a02ba62249521fe20a53b8d033c440;hp=9b2e09798aa45596fba1eae5c251d1206dff7d67;hpb=b695f709e8a342e35e482b0437eb6cdacdc58b6b;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/harness b/t/harness
index 9b2e097..b5e3e87 100644
--- a/t/harness
+++ b/t/harness
@@ -5,16 +5,26 @@
 
 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';
 
+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(
 		lib/bigint.t		1
@@ -35,27 +45,81 @@ 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 {
     unless (@tests) {
-	@tests = <base/*.t comp/*.t cmd/*.t io/*.t op/*.t lib/*.t>;
+	push @tests, <base/*.t>;
+        push @tests, <comp/*.t>;
+        push @tests, <cmd/*.t>;
+        push @tests, <run/*.t>;
+        push @tests, <io/*.t>;
+        push @tests, <op/*.t>;
+        push @tests, <uni/*.t>;
+        push @tests, <lib/*.t>;
+        push @tests, <japh/*.t> if $torture;
+	push @tests, <win32/*.t> 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{$_};
+	    }
+	}
 	use File::Spec;
 	my $updir = File::Spec->updir;
-	my $mani  = File::Spec->catdir(File::Spec->updir, "MANIFEST");
+	my $mani  = File::Spec->catfile(File::Spec->updir, "MANIFEST");
 	if (open(MANI, $mani)) {
 	    while (<MANI>) { # similar code in t/TEST
-	    if (m!^(ext/\S+/([^/]+\.t|test\.pl)|lib/\S+?(\.t|test\.pl))\s!) {
-		    push @tests, File::Spec->catdir($updir, $1);
+		if (m!^(ext/(\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 @tests, File::Spec->catfile($updir, $test);
 		}
 	    }
+	    close MANI;
 	} else {
 	    warn "$0: cannot open $mani: $!\n";
 	}
 	push @tests, <pod/*.t>;
+	push @tests, <x2p/*.t>;
     }
 }
-
+if ($^O eq 'MSWin32') {
+    s,\\,/,g for @tests;
+}
+@tests=grep /$re/, @tests 
+    if $re;
 Test::Harness::runtests @tests;
 exit(0) unless -e "../testcompile";