From: Jerry D. Hedden <jdhedden@cpan.org>
Date: Mon, 7 Jul 2008 13:33:22 +0000 (-0400)
Subject: threads::shared 1.24 (phase 3)
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=98916cfa40d9f419e90e2fb0494450bd460c85d9;p=p5sagit%2Fp5-mst-13.2.git

threads::shared 1.24 (phase 3)
From: "Jerry D. Hedden" <jdhedden@cpan.org>
Message-ID: <1ff86f510807071033j5136e337lab0f3d27575e9113@mail.gmail.com>

p4raw-id: //depot/perl@34110
---

diff --git a/ext/threads/shared/t/wait.t b/ext/threads/shared/t/wait.t
index e8a7a36..b0a7cc1 100644
--- a/ext/threads/shared/t/wait.t
+++ b/ext/threads/shared/t/wait.t
@@ -7,15 +7,15 @@ BEGIN {
         unshift @INC, '../lib';
     }
 
-    use Config;
-    if (! $Config{'useithreads'}) {
-        Test::skip_all(q/Perl not compiled with 'useithreads'/);
-    }
-
     # Import test.pl into its own package
     {
         package Test;
-        require($ENV{PERL_CORE} ? 'test.pl' : 't/test.pl');
+        require($ENV{PERL_CORE} ? './test.pl' : './t/test.pl');
+    }
+
+    use Config;
+    if (! $Config{'useithreads'}) {
+        Test::skip_all(q/Perl not compiled with 'useithreads'/);
     }
 }
 
@@ -43,11 +43,11 @@ BEGIN {
 use threads;
 use threads::shared;
 
+Test::watchdog(300);   # In case we get stuck
+
 my $TEST = 1;
 ok($TEST++, 1, 'Loaded');
 
-Test::watchdog(60);   # In case we get stuck
-
 ### Start of Testing ###
 
 # cond_wait and cond_timedwait extended tests adapted from cond.t
diff --git a/ext/threads/shared/t/waithires.t b/ext/threads/shared/t/waithires.t
index 8bb7b05..173d32e 100644
--- a/ext/threads/shared/t/waithires.t
+++ b/ext/threads/shared/t/waithires.t
@@ -7,15 +7,15 @@ BEGIN {
         unshift @INC, '../lib';
     }
 
-    use Config;
-    if (! $Config{'useithreads'}) {
-        Test::skip_all(q/Perl not compiled with 'useithreads'/);
-    }
-
     # Import test.pl into its own package
     {
         package Test;
-        require($ENV{PERL_CORE} ? 'test.pl' : 't/test.pl');
+        require($ENV{PERL_CORE} ? './test.pl' : './t/test.pl');
+    }
+
+    use Config;
+    if (! $Config{'useithreads'}) {
+        Test::skip_all(q/Perl not compiled with 'useithreads'/);
     }
 
     eval {
@@ -49,11 +49,11 @@ BEGIN {
 use threads;
 use threads::shared;
 
+Test::watchdog(60);   # In case we get stuck
+
 my $TEST = 1;
 ok($TEST++, 1, 'Loaded');
 
-Test::watchdog(60);   # In case we get stuck
-
 ### Start of Testing ###
 
 # subsecond cond_timedwait extended tests adapted from wait.t
@@ -131,7 +131,7 @@ SYNC_SHARED: {
 
     foreach (@wait_how) {
         $test_type = "cond_timedwait [$_]";
-        my $thr = threads->create(\&ctw_ok, $TEST, 0.05);
+        my $thr = threads->create(\&ctw_ok, $TEST, 0.1);
         $TEST = $thr->join();
     }