X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F30-threads.t;h=d48fa023032c4b5607433e873c464a307d0e4961;hb=bf1b09f4ab8df1710df549764d511b110c6cb396;hp=3f46124d0792b71fca8f3d3512ffe63fe125ba53;hpb=b56734d8bae611bf89f0c65a084de7079d119d96;p=perl%2Fmodules%2FLexical-Types.git

diff --git a/t/30-threads.t b/t/30-threads.t
index 3f46124..d48fa02 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;
 }
 
 {
@@ -34,6 +38,7 @@ BEGIN {
   my $tid = threads->tid();
   my ($file, $line) = (caller(0))[1, 2];
   my $where = "at $file line $line in thread $tid";
+  local $Test::Builder::Level = $Test::Builder::Level + 1;
   Test::More::is($_[0], __PACKAGE__, "base type is correct $where");
   Test::More::is($_[2], 'Tag', "original type is correct $where");
   $_[1] = $tid;