X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fharness;h=e7c1e8827121cb4c792df80dba8a45972d5dcfdc;hb=584420f022db57225e9644b9c6668ff9f567984a;hp=e745db8a34d454d82d52bb5369f8d8aba654e7af;hpb=40996b7810cf32994b2b30ccaee4f9d870d60be0;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/harness b/t/harness
index e745db8..e7c1e88 100644
--- a/t/harness
+++ b/t/harness
@@ -16,7 +16,7 @@ use Test::Harness;
 $Test::Harness::switches = "";    # Too much noise otherwise
 $Test::Harness::verbose = shift if @ARGV && $ARGV[0] eq '-v';
 
-if ($ARGV[0] eq '-torture') {
+if ($ARGV[0] && $ARGV[0] eq '-torture') {
     shift;
     $torture = 1;
 }
@@ -50,6 +50,20 @@ 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);
@@ -66,22 +80,44 @@ if (@ARGV) {
         push @tests, <io/*.t>;
         push @tests, <op/*.t>;
         push @tests, <uni/*.t>;
+        push @tests, <mro/*.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)) {
+	    my @manitests = ();
+	    my $ext_pat = $^O eq 'MSWin32' ? '(?:win32/)?ext' : 'ext';
 	    while (<MANI>) { # similar code in t/TEST
-	    if (m!^(ext/\S+/?(?:[^/\s]+\.t|test\.pl)|lib/\S+?(?:\.t|test\.pl))\s!) {
-		    push @tests, File::Spec->catfile($updir, $1);
+		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, <Module_Pluggable/*.t>;
 	push @tests, <pod/*.t>;
 	push @tests, <x2p/*.t>;
     }
@@ -89,43 +125,7 @@ if (@ARGV) {
 if ($^O eq 'MSWin32') {
     s,\\,/,g for @tests;
 }
+@tests=grep /$re/, @tests 
+    if $re;
 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 (($_=<DATA>) =~ /^__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, <F>;
-             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";
-}
+exit(0);