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

diff --git a/t/TEST b/t/TEST
index ab543f8..19f8fb1 100755
--- a/t/TEST
+++ b/t/TEST
@@ -23,16 +23,31 @@ my %dir_to_switch =
      '../ext/File-Glob/t' => '-I.. -MTestInit', # FIXME - tests assume t/
      );
 
+# I think in the end I'd like "not absolute" to be the default", as it saves
+# some fakery within TestInit which can peturb tests, and takes CPU.
+my %no_abs =
+    ('../ext/Pod-Parser' => 1,
+    );
+	      
 my %temp_no_core =
     ('../ext/B-Debug' => 1,
      '../ext/Compress-Raw-Bzip2' => 1,
      '../ext/Compress-Raw-Zlib' => 1,
-     '../ext/Devel-PPPort' => 1,
-     '../ext/Encode' => 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,
+     '../cpan/NEXT' => 1,
+     '../ext/parent' => 1,
+     '../cpan/Parse-CPAN-Meta' => 1,
+     '../ext/Pod-Simple' => 1,
+     '../cpan/podlators' => 1,
+     '../ext/Test-Simple' => 1,
+     '../cpan/Tie-RefHash' => 1,
      '../ext/Time-HiRes' => 1,
+     '../ext/Unicode-Collate' => 1,
      '../ext/Unicode-Normalize' => 1,
     );
 
@@ -80,6 +95,9 @@ our $show_elapsed_time = $ENV{HARNESS_TIMER} || 0;
 }
 
 chdir 't' if -f 't/TEST';
+if (-f 'TEST' && -f 'harness' && -d '../lib') {
+    @INC = '../lib';
+}
 
 die "You need to run \"make test\" first to set things up.\n"
   unless -e 'perl' or -e 'perl.exe' or -e 'perl.pm';
@@ -145,11 +163,11 @@ sub _scan_test {
 
     my $switch = "";
     if ($first_line =~ /#!.*\bperl.*\s-\w*([tT])/) {
-        $switch = qq{"-$1"};
+        $switch = "-$1";
     } else {
         if ($::taintwarn) {
             # not all tests are expected to pass with this option
-            $switch = '"-t"';
+            $switch = '-t';
         } else {
             $switch = '';
         }
@@ -175,12 +193,15 @@ 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';
 	    $perl = '../../t/perl';
-	    $testswitch = "-I../.. -MTestInit=U2T,A";
+	    $testswitch = "-I../.. -MTestInit=U2T";
+	    if (!$no_abs{$run_dir}) {
+		$testswitch = $testswitch . ',A';
+	    }
 	    if ($temp_no_core{$run_dir}) {
 		$testswitch = $testswitch . ',NC';
 	    }
@@ -189,9 +210,9 @@ sub _scan_test {
 	}
     }
 
-    my $utf8 = $::with_utf8 ? '-I$lib -Mutf8' : '';
+    my $utf8 = $::with_utf8 ? "-I$lib -Mutf8" : '';
 
-    return {
+    my %options = (
 	perl => $perl,
 	lib => $lib,
 	test => $test,
@@ -201,7 +222,9 @@ sub _scan_test {
 	utf8 => $utf8,
 	file => $file_opts,
 	switch => $switch,
-    };
+    );
+
+    return \%options;
 }
 
 sub _cmd {
@@ -266,15 +289,11 @@ sub _after_fork {
 }
 
 sub _run_test {
-    my($harness, $test, $type) = @_;
-    if (!defined $type) {
-	# To conform to the interface expected by exec in TAP::Harness
-	$type = 'perl';
-    }
+    my ($test, $type) = @_;
 
     my $options = _scan_test($test, $type);
-
-    $test = $options->{test}; # Might have changed if we're in ext/Foo
+    # $test might have changed if we're in ext/Foo, so don't use it anymore
+    # from now on. Use $options->{test} instead.
 
     _before_fork($options);
 
@@ -325,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]!) {
@@ -355,7 +374,7 @@ unless (@ARGV) {
     # then comp, to validate that require works
     # then run, to validate that -M works
     # then we know we can -MTestInit for everything else, making life simpler
-    foreach my $dir (qw(base comp run cmd io op uni mro)) {
+    foreach my $dir (qw(base comp run cmd io re op uni mro)) {
 	_find_tests($dir);
     }
     _find_tests("lib") unless $::core;
@@ -484,7 +503,7 @@ EOT
 	    $te = '';
 	}
 
-        my $results = _run_test(undef, $test, $type);
+	my $results = _run_test($test, $type);
 
 	my $failure;
 	my $next = 0;
@@ -550,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};
 
@@ -570,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;
 		    }