X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2FTEST;h=7ce93663a5bf320e00a7075050b26866f7643970;hb=fceebc475db7280476c58dcfb36c7e1cd6795eec;hp=f37d2bed3797f35ce5a0f9bfd36277abe492c9c7;hpb=6b202754e48fe50b2e197258ffdabd22fc2752c2;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/TEST b/t/TEST
index f37d2be..7ce9366 100755
--- a/t/TEST
+++ b/t/TEST
@@ -14,6 +14,7 @@ $| = 1;
 # Let tests know they're running in the perl core.  Useful for modules
 # which live dual lives on CPAN.
 $ENV{PERL_CORE} = 1;
+delete $ENV{PERL5LIB};
 
 # remove empty elements due to insertion of empty symbols via "''p1'" syntax
 @ARGV = grep($_,@ARGV) if $^O eq 'VMS';
@@ -104,7 +105,7 @@ sub _populate_hash {
 }
 
 unless (@ARGV) {
-    foreach my $dir (qw(base comp cmd run io op uni)) {
+    foreach my $dir (qw(base comp cmd run io op uni mro)) {
 	_find_tests($dir);
     }
     _find_tests("lib") unless $::core;
@@ -140,9 +141,8 @@ unless (@ARGV) {
     }
     my $mani = File::Spec->catfile($updir, "MANIFEST");
     if (open(MANI, $mani)) {
-	my $ext_pat = $^O eq 'MSWin32' ? '(?:win32/)?ext' : 'ext';
 	while (<MANI>) { # similar code in t/harness
-	    if (m!^($ext_pat/(\S+)/+(?:[^/\s]+\.t|test\.pl)|lib/\S+?(?:\.t|test\.pl))\s!) {
+	    if (m!^(ext/(\S+)/+(?:[^/\s]+\.t|test\.pl)|lib/\S+?(?:\.t|test\.pl))\s!) {
 		my $t = $1;
 		my $extension = $2;
 		if (!$::core || $t =~ m!^lib/[a-z]!)
@@ -151,6 +151,9 @@ unless (@ARGV) {
 			$extension =~ s!/t$!!;
 			# XXX Do I want to warn that I'm skipping these?
 			next if $skip{$extension};
+			my $flat_extension = $extension;
+			$flat_extension =~ s!-!/!g;
+			next if $skip{$flat_extension}; # Foo/Bar may live in Foo-Bar
 		    }
 		    my $path = File::Spec->catfile($updir, $t);
 		    push @ARGV, $path;
@@ -163,6 +166,7 @@ unless (@ARGV) {
 	warn "$0: cannot open $mani: $!\n";
     }
     unless ($::core) {
+	_find_tests('Module_Pluggable');
 	_find_tests('pod');
 	_find_tests('x2p');
 	_find_tests('japh') if $::torture;
@@ -382,7 +386,7 @@ EOT
 
 			    # SKIP is essentially the same as TODO for t/TEST
 			    # this still conforms to TAP:
-			    # http://search.cpan.org/dist/Test-Harness/lib/Test/Harness/TAP.pod
+			    # http://search.cpan.org/dist/TAP/TAP.pod
 			    $extra and $istodo = $extra =~ /#\s*(?:TODO|SKIP)\b/;
 			    $istodo = 1 if $todo{$num};
 
@@ -478,6 +482,12 @@ EOT
 	    $failure="FAILED--expected $max tests, saw $next";
 	}
 
+	if( !defined $failure  # don't mask a test failure
+	    and $? )
+	{
+	    $failure = "FAILED--non-zero wait status: $?";
+	}
+
 	if (defined $failure) {
 	    print "${te}$failure\n";
 	    $::bad_files++;