X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;ds=sidebyside;f=t%2F51-threads-teardown.t;h=e5461c69fb76e8c3badf78283bbe270541d9ab2e;hb=acd04c4caf2a342c115cd053dd5552a9ae2c414a;hp=d769fb62d62fc7f4edb1ca03c30efdde71b9ec31;hpb=2639ec27efc735d677fde3aa5dd0588531d88245;p=perl%2Fmodules%2Fautovivification.git

diff --git a/t/51-threads-teardown.t b/t/51-threads-teardown.t
index d769fb6..e5461c6 100644
--- a/t/51-threads-teardown.t
+++ b/t/51-threads-teardown.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,10 @@ use Test::More;
 
 BEGIN {
  require autovivification;
- if (autovivification::A_THREADSAFE()) {
-  plan tests => 1;
-  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();
+ plan tests => 1;
+ defined and diag "Using threads $_" for $threads::VERSION;
 }
 
 sub run_perl {
@@ -39,7 +43,7 @@ sub run_perl {
 
 SKIP:
 {
- skip 'Fails on 5.8.2 and lower' => 1 if $] <= 5.008002;
+ skip 'Fails on 5.8.2 and lower' => 1 if "$]" <= 5.008002;
 
  my $status = run_perl <<' RUN';
   my $code = 1 + 2 + 4;