Make utf8::encode respect magic

[perl5.git] / t / harness

diff --git a/t/harness b/t/harness
index afd4b6f..1a1efdb 100644 (file)
--- a/t/harness
+++ b/t/harness
@@ -7,12 +7,15 @@ BEGIN {
     chdir 't' if -d 't';
     @INC = '../lib';              # pick up only this build's lib
 }
-delete $ENV{PERL5LIB};
 
 my $torture; # torture testing?
 
 use TAP::Harness 3.13;
 use strict;
+use Config;
+
+$::do_nothing = $::do_nothing = 1;
+require './TEST';
 
 my $Verbose = 0;
 $Verbose++ while @ARGV && $ARGV[0] eq '-v' && shift;
@@ -51,10 +54,6 @@ my (@tests, $re);
 # [.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];
-}
-
 sub _extract_tests;
 sub _extract_tests {
     # This can probably be done more tersely with a map, but I doubt that it
@@ -111,6 +110,9 @@ if (@ARGV) {
     else {
        @tests = @ARGV;
     }
+    # This is a hack to force config_heavy.pl to be loaded, before the
+    # prep work for running a test changes directory.
+    1 if $Config{d_fork};
 } else {
     # Ideally we'd get somewhere close to Tux's Oslo rules
     # my $rules = {
@@ -129,10 +131,11 @@ if (@ARGV) {
     unless (@tests) {
        my @seq = <base/*.t>;
 
-       my @next = qw(comp run cmd io op uni mro lib porting);
+       my @next = qw(comp run cmd io re op uni mro lib porting);
        push @next, 'japh' if $torture;
        push @next, 'win32' if $^O eq 'MSWin32';
        push @next, 'benchmark' if $ENV{PERL_BENCHMARK};
+       push @next, 'bigmem' if $ENV{PERL_TEST_MEMORY};
        # Hopefully TAP::Parser::Scheduler will support this syntax soon.
        # my $next = { par => '{' . join (',', @next) . '}/*.t' };
        my $next = { par => [
@@ -159,42 +162,8 @@ if (@ARGV) {
        push @seq, $next;
 
        my @last;
-       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 = ();
-           while (<MANI>) { # similar code in t/TEST
-               if (m!^(ext/(\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};
-                       my $flat_extension = $extension;
-                       $flat_extension =~ s!-!/!g;
-                       next if $skip{$flat_extension}; # Foo/Bar may live in Foo-Bar
-                   }
-                   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 @last, sort { lc $a cmp lc $b } @manitests;
-       } else {
-           warn "$0: cannot open $mani: $!\n";
-       }
-       push @last, <pod/*.t>;
+       push @last,  sort { lc $a cmp lc $b }
+           _tests_from_manifest($Config{extensions}, $Config{known_extensions});
        push @last, <x2p/*.t>;
 
        my %times;
@@ -212,7 +181,8 @@ if (@ARGV) {
            if ($^O eq 'MSWin32') {
                s,\\,/,g; # canonicalize path
            };
-           m!(.*[/])! or die "'$_'";
+           # Treat every file matching lib/*.t as a "directory"
+           m!\A(\.\./lib/[^/]+\.t\z|.*[/])! or die "'$_'";
            push @{$dir{$1}}, $_;
            $total_time{$1} += $times{$_} || 0;
        }
@@ -221,7 +191,7 @@ if (@ARGV) {
 
        # Generate T::H schedule rules that run the contents of each directory
        # sequentially.
-       push @seq, { par => [ map { { seq => "$_*" } } sort {
+       push @seq, { par => [ map { s!/$!/*!; { seq => $_ } } sort {
            # Directories, ordered by total time descending then name ascending
            $total_time{$b} <=> $total_time{$a} || $a cmp $b
        } keys %dir ] };
@@ -235,11 +205,29 @@ if ($^O eq 'MSWin32') {
 @tests=grep /$re/, @tests 
     if $re;
 
+my %options;
+
+my $type = 'perl';
+
+# Load TAP::Parser now as otherwise it could be required in the short time span
+# in which the harness process chdirs into ext/Dist
+require TAP::Parser;
+
 my $h = TAP::Harness->new({
     rules       => $rules,
     color       => $color,
     jobs        => $jobs,
     verbosity   => $Verbose,
+    exec        => sub {
+       my ($harness, $test) = @_;
+
+       my $options = $options{$test};
+       if (!defined $options) {
+           $options = $options{$test} = _scan_test($test, $type);
+       }
+
+       return [ split ' ', _cmd($options, $type) ];
+    },
 });
 
 if ($state) {
@@ -257,9 +245,21 @@ if ($state) {
 
 $h->callback(
             parser_args => sub {
-                my ( $args, $test ) = @_;
-                push @{ $args->{switches} }, '-I../lib';
+                my ($args, $job) = @_;
+                my $test = $job->[0];
+                _before_fork($options{$test});
+                push @{ $args->{switches} }, "-I../../lib";
             }
             );
-$h->runtests(@tests);
-exit(0);
+
+$h->callback(
+            made_parser => sub {
+                my ($parser, $job) = @_;
+                my $test = $job->[0];
+                my $options = delete $options{$test};
+                _after_fork($options);
+            }
+            );
+
+my $agg = $h->runtests(@tests);
+exit $agg->has_errors ? 1 : 0;