X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fharness;h=b5e3e872f1b1126fb1014e82ba8d67f082385bfc;hb=63fa9adcade8ebea86e41864381690cdfea27db9;hp=1a15ebcca252fcb2eb541c0f7a6762ceee6473f1;hpb=22a65f1e060cc583560af22c8de3f5ccad3c0161;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/harness b/t/harness
index 1a15ebc..b5e3e87 100644
--- a/t/harness
+++ b/t/harness
@@ -9,11 +9,18 @@ BEGIN {
     $ENV{PERL5LIB} = '../lib';    # so children will see it too
 }
 
+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;
@@ -40,6 +47,23 @@ foreach (keys %datahandle) {
 
 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) {
     if ($^O eq 'MSWin32') {
 	@tests = map(glob($_),@ARGV);
@@ -57,14 +81,30 @@ if (@ARGV) {
         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->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->catfile($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;
@@ -72,11 +112,14 @@ if (@ARGV) {
 	    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";