X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F40-threads.t;h=f67dfc313bf182f6f46229684a667c0f956011dd;hb=3e2559bcd9ca00ce63c1d5b8d05defbdb9b71e7a;hp=7c6203d372df52be7cec4f1e1fbe48385aacfdc2;hpb=ed45fb4404201c2e17ffa5c26a2320ceeb132e61;p=perl%2Fmodules%2FVariable-Magic.git

diff --git a/t/40-threads.t b/t/40-threads.t
index 7c6203d..f67dfc3 100644
--- a/t/40-threads.t
+++ b/t/40-threads.t
@@ -3,35 +3,43 @@
 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_VARIABLE_MAGIC_TEST_THREADS} ? 1 : !1;
+ my $t_v   = $force ? '0' : '1.67';
+ my $ts_v  = $force ? '0' : '1.14';
+ 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;
+ skipall "threads $t_v required to test thread safety"
+                                              unless eval "use threads $t_v; 1";
+ skipall "threads::shared $ts_v required to test thread safety"
+                                     unless eval "use threads::shared $ts_v; 1";
 }
 
-use threads; # Before Test::More
-use threads::shared;
-
-use Test::More;
+use Test::More; # after threads
 
-use Variable::Magic qw/wizard cast dispell getdata VMG_THREADSAFE VMG_OP_INFO_NAME VMG_OP_INFO_OBJECT/;
+use Variable::Magic qw<
+ wizard cast dispell getdata
+ VMG_THREADSAFE VMG_OP_INFO_NAME VMG_OP_INFO_OBJECT
+>;
 
-if (VMG_THREADSAFE) {
- plan tests => 2 * (4 * 18 + 1) + 2 * (4 * 13 + 1);
- my $v = $threads::VERSION;
- diag "Using threads $v" if defined $v;
- $v = $threads::shared::VERSION;
- diag "Using threads::shared $v" if defined $v;
-} else {
- plan skip_all => 'This Variable::Magic isn\'t thread safe';
+BEGIN {
+ skipall 'This Variable::Magic isn\'t thread safe' unless VMG_THREADSAFE;
+ plan tests => (4 * 18 + 1) + (4 * 13 + 1);
+ defined and diag "Using threads $_"         for $threads::VERSION;
+ defined and diag "Using threads::shared $_" for $threads::shared::VERSION;
 }
 
 my $destroyed : shared = 0;
-my $sig = undef;
 
 sub try {
  my ($dispell, $op_info) = @_;
@@ -39,15 +47,19 @@ sub try {
  my $c   = 0;
  my $wiz = eval {
   wizard data    => sub { $_[1] + $tid },
-         sig     => $sig,
          get     => sub { ++$c; 0 },
          set     => sub {
-                     my $name = $_[-1];
-                     $name = $name->name if $op_info == VMG_OP_INFO_OBJECT;
-                     is $name, 'sassign', "opname for op_info $op_info in thread $tid is correct";
+                     my $op = $_[-1];
+                     if ($op_info == VMG_OP_INFO_OBJECT) {
+                      is_deeply { class => ref($op),   name => $op->name },
+                                { class => 'B::BINOP', name => 'sassign' },
+                                "op object in thread $tid is correct";
+                     } else {
+                      is $op, 'sassign', "op name in thread $tid is correct";
+                     }
                      0
                     },
-         free    => sub { ++$destroyed; 0 },
+         free    => sub { lock $destroyed; ++$destroyed; 0 },
          op_info => $op_info
  };
  is($@,     '',    "wizard in thread $tid doesn't croak");
@@ -82,11 +94,17 @@ sub try {
 }
 
 for my $dispell (1, 0) {
- for my $sig (undef, Variable::Magic::gensig()) {
+ {
+  lock $destroyed;
   $destroyed = 0;
-  my @t = map { threads->create(\&try, $dispell, $_) }
-                               (VMG_OP_INFO_NAME) x 2, (VMG_OP_INFO_OBJECT) x 2;
-  $_->join for @t;
-  is($destroyed, (1 - $dispell) * 4, 'destructors');
+ }
+
+ my @t = map { threads->create(\&try, $dispell, $_) }
+                              (VMG_OP_INFO_NAME) x 2, (VMG_OP_INFO_OBJECT) x 2;
+ $_->join for @t;
+
+ {
+  lock $destroyed;
+  is $destroyed, (1 - $dispell) * 4, 'destructors';
  }
 }