X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F30-threads.t;h=c616b76ecf65a3804a3de55cb5461c87a30ac331;hb=61f64dfa5fa4f435e6cd854d22e4325ef1eb0068;hp=aa42d69f98c19ef1daa793b6fdfb3048a148956b;hpb=1a89808e0eb3e27e0d2b61d0bfa84fa8ab94b9cb;p=perl%2Fmodules%2FLexical-Types.git

diff --git a/t/30-threads.t b/t/30-threads.t
index aa42d69..c616b76 100644
--- a/t/30-threads.t
+++ b/t/30-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_LEXICAL_TYPES_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 Lexical::Types;
- if (Lexical::Types::LT_THREADSAFE()) {
-  plan tests => 10 * 2 * 3 * (1 + 2);
-  defined and diag "Using threads $_" for $threads::VERSION;
- } else {
-  plan skip_all => 'This Lexical::Types isn\'t thread safe';
- }
+ skipall 'This Lexical::Types isn\'t thread safe'
+                                         unless Lexical::Types::LT_THREADSAFE();
+ plan tests => 10 * 2 * 3 * (1 + 2);
+ defined and diag "Using threads $_" for $threads::VERSION;
 }
 
 {
@@ -63,7 +67,7 @@ EVALD
 SKIP:
   {
    skip 'Hints aren\'t propagated into eval STRING below perl 5.10' => 3
-                                                             unless $] >= 5.010;
+                                                           unless "$]" >= 5.010;
    eval <<'EVALD';
     my Tag $t3;
     is $t3, $tid, "typed lexical correctly initialized in eval (propagated) at run $_ in thread $tid"