X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=ext%2Fthreads%2Ft%2Ffree.t;h=87fdae9c12ca3d36d072495c012cead024e0bcc1;hb=e301958b4a047f87d3a6999ce873534a3429eec3;hp=46b1bb4180dd31861417d786b3b617ea4cfc0c52;hpb=f3086ff03c35517aff5af05759ba67d3712644c6;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/ext/threads/t/free.t b/ext/threads/t/free.t
index 46b1bb4..87fdae9 100644
--- a/ext/threads/t/free.t
+++ b/ext/threads/t/free.t
@@ -6,10 +6,16 @@ BEGIN {
         chdir 't';
         unshift @INC, '../lib';
     }
+
+    # Import test.pl into its own package
+    {
+        package Test;
+        require($ENV{PERL_CORE} ? './test.pl' : './t/test.pl');
+    }
+
     use Config;
     if (! $Config{'useithreads'}) {
-        print("1..0 # Skip: Perl not compiled with 'useithreads'\n");
-        exit(0);
+        Test::skip_all(q/Perl not compiled with 'useithreads'/);
     }
 }
 
@@ -18,13 +24,8 @@ use ExtUtils::testlib;
 use threads;
 
 BEGIN {
-    eval {
-        require threads::shared;
-        threads::shared->import();
-    };
-    if ($@ || ! $threads::shared::threads_shared) {
-        print("1..0 # Skip: threads::shared not available\n");
-        exit(0);
+    if (! eval 'use threads::shared; 1') {
+        Test::skip_all(q/threads::shared not available/);
     }
 
     require Thread::Queue;
@@ -33,6 +34,7 @@ BEGIN {
     print("1..29\n");   ### Number of tests that will be run ###
 }
 
+Test::watchdog(120);   # In case we get stuck
 
 my $q = Thread::Queue->new();
 my $TEST = 1;
@@ -212,4 +214,6 @@ sub threading_3 {
 }
 ok($COUNT == 2, "Done - $COUNT threads");
 
+exit(0);
+
 # EOF