Integrate mainline

[perl5.git] / t / harness

diff --git a/t/harness b/t/harness
index 9b2e097..53665f4 100644 (file)
--- a/t/harness
+++ b/t/harness
@@ -5,16 +5,19 @@
 
 BEGIN {
     chdir 't' if -d 't';
-    unshift @INC, '../lib';
+    @INC = '../lib';              # pick up only this build's lib
     $ENV{PERL5LIB} = '../lib';    # so children will see it too
 }
-use lib '../lib';
 
 use Test::Harness;
 
 $Test::Harness::switches = "";    # Too much noise otherwise
 $Test::Harness::verbose = shift if @ARGV && $ARGV[0] eq '-v';
 
+# Let tests know they're running in the perl core.  Useful for modules
+# which live dual lives on CPAN.
+$ENV{PERL_CORE} = 1;
+
 #fudge DATA for now.
 %datahandle = qw(
                lib/bigint.t            1
@@ -35,20 +38,36 @@ foreach (keys %datahandle) {
      unlink "$_.t";
 }
 
+my @tests = ();
+
 if (@ARGV) {
-    @tests = @ARGV;
+    if ($^O eq 'MSWin32') {
+       @tests = map(glob($_),@ARGV);
+    }
+    else {
+       @tests = @ARGV;
+    }
 } else {
     unless (@tests) {
-       @tests = <base/*.t comp/*.t cmd/*.t io/*.t op/*.t lib/*.t>;
+       push @tests, <base/*.t>;
+        push @tests, <comp/*.t>;
+        push @tests, <cmd/*.t>;
+        push @tests, <run/*.t>;
+        push @tests, <io/*.t>;
+        push @tests, <op/*.t>;
+        push @tests, <uni/*.t>;
+        push @tests, <lib/*.t>;
+       push @tests, <win32/*.t> if $^O eq 'MSWin32';
        use File::Spec;
        my $updir = File::Spec->updir;
-       my $mani  = File::Spec->catdir(File::Spec->updir, "MANIFEST");
+       my $mani  = File::Spec->catfile(File::Spec->updir, "MANIFEST");
        if (open(MANI, $mani)) {
            while (<MANI>) { # similar code in t/TEST
-           if (m!^(ext/\S+/([^/]+\.t|test\.pl)|lib/\S+?(\.t|test\.pl))\s!) {
-                   push @tests, File::Spec->catdir($updir, $1);
+           if (m!^(ext/\S+/?([^/]+\.t|test\.pl)|lib/\S+?(\.t|test\.pl))\s!) {
+                   push @tests, File::Spec->catfile($updir, $1);
                }
            }
+           close MANI;
        } else {
            warn "$0: cannot open $mani: $!\n";
        }