X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2FTEST;h=19f8fb1e6d31ac951639de376fd085439d5d6bde;hb=9b7091183a0e6b41a658e590f90e543efae3b2e4;hp=32767b2419b542ba65945e07680ef6bf12b5ec18;hpb=34c6aaef6408708848215dca41d2e98ea8db4514;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/TEST b/t/TEST
index 32767b2..19f8fb1 100755
--- a/t/TEST
+++ b/t/TEST
@@ -33,22 +33,22 @@ my %temp_no_core =
     ('../ext/B-Debug' => 1,
      '../ext/Compress-Raw-Bzip2' => 1,
      '../ext/Compress-Raw-Zlib' => 1,
-     '../ext/Devel-PPPort' => 1,
-     '../ext/Getopt-Long' => 1,
+     '../cpan/Devel-PPPort' => 1,
+     '../cpan/Getopt-Long' => 1,
      '../ext/IO-Compress' => 1,
-     '../ext/IPC-SysV' => 1,
      '../ext/Math-BigInt' => 1,
      '../ext/Math-BigRat' => 1,
      '../ext/MIME-Base64' => 1,
-     '../ext/NEXT' => 1,
+     '../cpan/NEXT' => 1,
      '../ext/parent' => 1,
+     '../cpan/Parse-CPAN-Meta' => 1,
      '../ext/Pod-Simple' => 1,
-     '../ext/Parse-CPAN-Meta' => 1,
-     '../ext/Tie-RefHash' => 1,
+     '../cpan/podlators' => 1,
+     '../ext/Test-Simple' => 1,
+     '../cpan/Tie-RefHash' => 1,
      '../ext/Time-HiRes' => 1,
      '../ext/Unicode-Collate' => 1,
      '../ext/Unicode-Normalize' => 1,
-     '../ext/podlators' => 1,
     );
 
 if ($::do_nothing) {
@@ -193,7 +193,7 @@ sub _scan_test {
     my $dir = $1;
     my $testswitch = $dir_to_switch{$dir};
     if (!defined $testswitch) {
-	if ($test =~ s!^(\.\./ext/[^/]+)/t!t!) {
+	if ($test =~ s!^(\.\./(?:cpan|dist|ext)/[^/]+)/t!t!) {
 	    $run_dir = $1;
 	    $return_dir = '../../t';
 	    $lib = '../../lib';
@@ -344,7 +344,7 @@ sub _tests_from_manifest {
     my $mani = '../MANIFEST';
     if (open(MANI, $mani)) {
 	while (<MANI>) {
-	    if (m!^(ext/(\S+)/+(?:[^/\s]+\.t|test\.pl)|lib/\S+?(?:\.t|test\.pl))\s!) {
+	    if (m!^((?:cpan|dist|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]!) {
@@ -569,7 +569,7 @@ EOT
 
 			    # SKIP is essentially the same as TODO for t/TEST
 			    # this still conforms to TAP:
-			    # http://search.cpan.org/dist/TAP/TAP.pod
+			    # http://search.cpan.org/dist/TAP/TAP.pm
 			    $extra and $istodo = $extra =~ /#\s*(?:TODO|SKIP)\b/;
 			    $istodo = 1 if $todo{$num};
 
@@ -589,7 +589,7 @@ EOT
 		    else {
 			# module tests are allowed extra output,
 			# because Test::Harness allows it
-			next if $test =~ /^\W*(ext|lib)\b/;
+			next if $test =~ /^\W*(cpan|dist|ext|lib)\b/;
 			$failure = "FAILED--unexpected output at test $next";
 			last;
 		    }