Change 34110: [PATCH] threads::shared 1.24 (phase 3)

[Rafael Garcia-Suarez]

Change 34110 by [EMAIL PROTECTED] on 2008/07/08 08:06:23

        Subject: [PATCH] threads::shared 1.24 (phase 3)
        From: "Jerry D. Hedden" <[EMAIL PROTECTED]>
        Date: Mon, 7 Jul 2008 13:33:22 -0400
        Message-ID: <[EMAIL PROTECTED]>

Affected files ...

... //depot/perl/ext/threads/shared/t/wait.t#12 edit
... //depot/perl/ext/threads/shared/t/waithires.t#10 edit

Differences ...

==== //depot/perl/ext/threads/shared/t/wait.t#12 (text) ====
Index: perl/ext/threads/shared/t/wait.t
--- perl/ext/threads/shared/t/wait.t#11~34102~  2008-07-06 07:12:24.000000000 
-0700
+++ perl/ext/threads/shared/t/wait.t    2008-07-08 01:06:23.000000000 -0700
@@ -7,15 +7,15 @@
         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 @@
 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

==== //depot/perl/ext/threads/shared/t/waithires.t#10 (text) ====
Index: perl/ext/threads/shared/t/waithires.t
--- perl/ext/threads/shared/t/waithires.t#9~34102~      2008-07-06 
07:12:24.000000000 -0700
+++ perl/ext/threads/shared/t/waithires.t       2008-07-08 01:06:23.000000000 
-0700
@@ -7,15 +7,15 @@
         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 @@
 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 @@
 
     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();
     }
 
End of Patch.