Put a watchdog on openpid.t: it has been found to hang in some Win32 smokes.

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

diff --git a/t/TEST b/t/TEST
index 703889c..19f8fb1 100755 (executable)
--- a/t/TEST
+++ b/t/TEST
@@ -33,10 +33,9 @@ my %temp_no_core =
     ('../ext/B-Debug' => 1,
      '../ext/Compress-Raw-Bzip2' => 1,
      '../ext/Compress-Raw-Zlib' => 1,
-     '../ext/Devel-PPPort' => 1,
+     '../cpan/Devel-PPPort' => 1,
      '../cpan/Getopt-Long' => 1,
      '../ext/IO-Compress' => 1,
-     '../cpan/IPC-SysV' => 1,
      '../ext/Math-BigInt' => 1,
      '../ext/Math-BigRat' => 1,
      '../ext/MIME-Base64' => 1,
@@ -194,7 +193,7 @@ sub _scan_test {
     my $dir = $1;
     my $testswitch = $dir_to_switch{$dir};
     if (!defined $testswitch) {
-       if ($test =~ s!^(\.\./(?:cpan|ext)/[^/]+)/t!t!) {
+       if ($test =~ s!^(\.\./(?:cpan|dist|ext)/[^/]+)/t!t!) {
            $run_dir = $1;
            $return_dir = '../../t';
            $lib = '../../lib';
@@ -345,7 +344,7 @@ sub _tests_from_manifest {
     my $mani = '../MANIFEST';
     if (open(MANI, $mani)) {
        while (<MANI>) {
-           if (m!^((?:cpan|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]!) {
@@ -590,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;
                    }