Break out the code that finds tests in MANIFEST into _tests_from_manifest().

[p5sagit/p5-mst-13.2.git] / t / TEST

diff --git a/t/TEST b/t/TEST
index aa663c5..58f1da5 100755 (executable)
--- a/t/TEST
+++ b/t/TEST
@@ -14,9 +14,6 @@ $| = 1;
 #BEGIN { require '../lib/strict.pm'; "strict"->import() };
 #BEGIN { require '../lib/warnings.pm'; "warnings"->import() };
 
-# 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
@@ -132,6 +129,12 @@ sub _scan_test {
     return { file => $file_opts, switch => $switch };
 }
 
+# directories with special sets of test switches
+my %dir_to_switch =
+    (base => '',
+     comp => '',
+     run => '',
+     );
 
 sub _run_test {
     my($test, $type) = @_;
@@ -140,9 +143,14 @@ sub _run_test {
 
     my $perl = './perl';
     my $lib  = '../lib';
+    $test =~ /^([^\/]+)/;
+
+    my $testswitch = $dir_to_switch{$1};
+    if (!defined $testswitch) {
+       $testswitch = '-I. -MTestInit';  # -T will remove . from @INC
+    }
 
     my $utf8 = $::with_utf8 ? '-I$lib -Mutf8' : '';
-    my $testswitch = '-I. -MTestInit';  # -T will remove . from @INC
 
     my $results;
     if ($type eq 'deparse') {
@@ -196,56 +204,28 @@ sub _quote_args {
 }
 
 sub _populate_hash {
+    return unless defined $_[0];
     return map {$_, 1} split /\s+/, $_[0];
 }
 
-unless (@ARGV) {
-    # base first, as TEST bails out if that can't run
-    # 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)) {
-       _find_tests($dir);
-    }
-    _find_tests("lib") unless $::core;
-    # Config.pm may be broken for make minitest. And this is only a refinement
-    # for skipping tests on non-default builds, so it is allowed to fail.
-    # What we want to to is make a list of extensions which we did not build.
-    my $configsh = '../config.sh';
+sub _tests_from_manifest {
+    my ($extensions, $known_extensions) = @_;
     my %skip;
-    if (-f $configsh) {
-       my (%extensions, %known_extensions);
-       open FH, $configsh or die "Can't open $configsh: $!";
-       while (<FH>) {
-           if (/^extensions=['"](.*)['"]$/) {
-               # Deliberate string interpolation to avoid triggering possible
-               # $1 resetting bugs.
-               %extensions = _populate_hash ("$1");
-           }
-           elsif (/^known_extensions=['"](.*)['"]$/) {
-               %known_extensions = _populate_hash ($1);
-           }
-       }
-       if (%extensions) {
-           if (%known_extensions) {
-               foreach (keys %known_extensions) {
-                   $skip{$_}++ unless $extensions{$_};
-               }
-           } else {
-               warn "No known_extensions line found in $configsh";
-           }
-       } else {
-           warn "No extensions line found in $configsh";
-       }
+    my %extensions = _populate_hash($extensions);
+    my %known_extensions = _populate_hash($known_extensions);
+
+    foreach (keys %known_extensions) {
+       $skip{$_}++ unless $extensions{$_};
     }
+
+    my @results;
     my $mani = '../MANIFEST';
     if (open(MANI, $mani)) {
        while (<MANI>) { # similar code in t/harness
            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]!)
-               {
+               if (!$::core || $t =~ m!^lib/[a-z]!) {
                    if (defined $extension) {
                        $extension =~ s!/t$!!;
                        # XXX Do I want to warn that I'm skipping these?
@@ -255,7 +235,7 @@ unless (@ARGV) {
                        next if $skip{$flat_extension}; # Foo/Bar may live in Foo-Bar
                    }
                    my $path = "../$t";
-                   push @ARGV, $path;
+                   push @results, $path;
                    $::path_to_name{$path} = $t;
                }
            }
@@ -264,6 +244,45 @@ unless (@ARGV) {
     } else {
        warn "$0: cannot open $mani: $!\n";
     }
+    return @results;
+}
+
+unless (@ARGV) {
+    # base first, as TEST bails out if that can't run
+    # 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)) {
+       _find_tests($dir);
+    }
+    _find_tests("lib") unless $::core;
+    # Config.pm may be broken for make minitest. And this is only a refinement
+    # for skipping tests on non-default builds, so it is allowed to fail.
+    # What we want to to is make a list of extensions which we did not build.
+    my $configsh = '../config.sh';
+    my ($extensions, $known_extensions);
+    if (-f $configsh) {
+       open FH, $configsh or die "Can't open $configsh: $!";
+       while (<FH>) {
+           if (/^extensions=['"](.*)['"]$/) {
+               $extensions = $1;
+           }
+           elsif (/^known_extensions=['"](.*)['"]$/) {
+               $known_extensions = $1;
+           }
+       }
+       if (!defined $known_extensions) {
+           warn "No known_extensions line found in $configsh";
+       }
+       if (!defined $extensions) {
+           warn "No extensions line found in $configsh";
+       }
+    }
+    # The "complex" constructions of list return from a subroutine, and push of
+    # a list, might fail if perl is really hosed, but they aren't needed for
+    # make minitest, and the building of extensions will likely also fail if
+    # something is that badly wrong.
+    push @ARGV, _tests_from_manifest($extensions, $known_extensions);
     unless ($::core) {
        _find_tests('pod');
        _find_tests('x2p');
@@ -362,9 +381,6 @@ EOT
            $te = '';
        }
 
-       # XXX DAPM %OVER not defined anywhere
-       # $test = $OVER{$test} if exists $OVER{$test};
-
         my $results = _run_test($test, $type);
 
        my $failure;