Add watchdog() call to ext/IO/t/io_multihomed.t

[perl5.git] / ext / IO / t / io_multihomed.t

diff --git a/ext/IO/t/io_multihomed.t b/ext/IO/t/io_multihomed.t
index 3560d7b..ec1cb2b 100644 (file)
--- a/ext/IO/t/io_multihomed.t
+++ b/ext/IO/t/io_multihomed.t
@@ -5,11 +5,10 @@ BEGIN {
        chdir 't' if -d 't';
        @INC = '../lib';
     }
        chdir 't' if -d 't';
        @INC = '../lib';
     }

-}

 
 

-use Config;
+    require($ENV{PERL_CORE} ? './test.pl' : './t/test.pl');

 
 

-BEGIN {
+    use Config;

     my $can_fork = $Config{d_fork} ||
                    (($^O eq 'MSWin32' || $^O eq 'NetWare') and
                     $Config{useithreads} and 
     my $can_fork = $Config{d_fork} ||
                    (($^O eq 'MSWin32' || $^O eq 'NetWare') and
                     $Config{useithreads} and 


@@ -25,20 +24,13 @@ BEGIN {
     elsif (!$can_fork) {
         $reason = 'no fork';
     }
     elsif (!$can_fork) {
         $reason = 'no fork';
     }

-    if ($reason) {
-       print "1..0 # Skip: $reason\n";
-       exit 0;
-    }
+    skip_all($reason) if $reason;

 }
 
 $| = 1;
 
 print "1..8\n";
 }
 
 $| = 1;
 
 print "1..8\n";

-
-eval {
-    $SIG{ALRM} = sub { die; };
-    alarm 60;
-};
+watchdog(15);

 
 package Multi;
 require IO::Socket::INET;
 
 package Multi;
 require IO::Socket::INET;