X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F30-threads.t;h=5122dd7ec73f6d9dd44f606ccf26211ea5083c70;hb=569b0505de7c5021759a402e898c1fcaaee2caac;hp=c3db6c15c8c21fb94eab99524ea35ac6e6c0a1f4;hpb=5c21bf6de3e2527b0fe556b5d67d785f1d686a8d;p=perl%2Fmodules%2FLexical-Types.git

diff --git a/t/30-threads.t b/t/30-threads.t
index c3db6c1..5122dd7 100644
--- a/t/30-threads.t
+++ b/t/30-threads.t
@@ -3,21 +3,33 @@
 use strict;
 use warnings;
 
+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;
 
-use Test::More tests => 10 * 2 * 2 * (1 + 2);
+use Test::More;
 
-defined and diag "Using threads $_" for $threads::VERSION;
+BEGIN {
+ require Lexical::Types;
+ 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;
+}
 
 {
  package Lexical::Types::Test::Tag;
@@ -26,6 +38,7 @@ defined and diag "Using threads $_" for $threads::VERSION;
   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;
@@ -50,6 +63,16 @@ sub try {
    is $t2, $tid, "typed lexical correctly initialized in eval at run $_ in thread $tid";
 EVALD
   diag $@ if $@;
+
+SKIP:
+  {
+   skip 'Hints aren\'t propagated into eval STRING below perl 5.10' => 3
+                                                             unless $] >= 5.010;
+   eval <<'EVALD';
+    my Tag $t3;
+    is $t3, $tid, "typed lexical correctly initialized in eval (propagated) at run $_ in thread $tid"
+EVALD
+  }
  }
 }