X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F50-threads.t;h=9c095457ff229fc6e2ac09bba95bcd673913145d;hb=acd04c4caf2a342c115cd053dd5552a9ae2c414a;hp=99aa1ada3ca263c932c851f4cccf20f252ae47f8;hpb=120d12f635bf0ef0f334f463c455a0d2082db4e9;p=perl%2Fmodules%2Fautovivification.git

diff --git a/t/50-threads.t b/t/50-threads.t
index 99aa1ad..9c09545 100644
--- a/t/50-threads.t
+++ b/t/50-threads.t
@@ -3,14 +3,20 @@
 use strict;
 use warnings;
 
-use Config qw/%Config/;
+sub skipall {
+ my ($msg) = @_;
+ require Test::More;
+ Test::More::plan(skip_all => $msg);
+}
+
+use Config qw<%Config>;
 
 BEGIN {
- if (!$Config{useithreads}) {
-  require Test::More;
-  Test::More->import;
-  plan(skip_all => 'This perl wasn\'t built to support threads');
- }
+ my $force = $ENV{PERL_AUTOVIVIFICATION_TEST_THREADS} ? 1 : !1;
+ skipall 'This perl wasn\'t built to support threads'
+                                                    unless $Config{useithreads};
+ skipall 'perl 5.13.4 required to test thread safety'
+                                              unless $force or "$]" >= 5.013004;
 }
 
 use threads;
@@ -19,12 +25,19 @@ use Test::More;
 
 BEGIN {
  require autovivification;
- if (autovivification::A_THREADSAFE()) {
-  plan tests => 10 * 2 * 3 * (1 + 2);
-  defined and diag "Using threads $_" for $threads::VERSION;
- } else {
-  plan skip_all => 'This autovivification isn\'t thread safe';
- }
+ skipall 'This autovivification isn\'t thread safe'
+                                        unless autovivification::A_THREADSAFE();
+}
+
+my ($threads, $runs);
+BEGIN {
+ $threads = 10;
+ $runs    = 2;
+}
+
+BEGIN {
+ plan tests => $threads * $runs * 3 * (1 + 2);
+ defined and diag "Using threads $_" for $threads::VERSION;
 }
 
 {
@@ -33,7 +46,7 @@ BEGIN {
  sub try {
   my $tid = threads->tid();
 
-  for my $run (1 .. 2) {
+  for my $run (1 .. $runs) {
    {
     my $x;
     my $y = $x->{foo};
@@ -53,7 +66,7 @@ BEGIN {
 SKIP:
    {
     skip 'Hints aren\'t propagated into eval STRING below perl 5.10' => 3 * 2
-                                                             unless $] >= 5.010;
+                                                           unless "$]" >= 5.010;
     {
      my $x;
      eval 'my $y = $x->{foo}';
@@ -77,5 +90,5 @@ SKIP:
  }
 }
 
-my @t = map threads->create(\&try), 1 .. 10;
+my @t = map threads->create(\&try), 1 .. $threads;
 $_->join for @t;