X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F41-clone.t;h=eb1e8c23196e7ca243ac5637ed10b9c6b9b1b301;hb=bdc2a15aa5ca3f57b45d2c6e560f110c91b2ae87;hp=e410f88888396122ed5df51804b03f60ea317bfc;hpb=93e1c8fccc5fcbedbf35207f01c6336202bca06f;p=perl%2Fmodules%2FVariable-Magic.git

diff --git a/t/41-clone.t b/t/41-clone.t
index e410f88..eb1e8c2 100644
--- a/t/41-clone.t
+++ b/t/41-clone.t
@@ -3,31 +3,39 @@
 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_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; # after threads
 
-use Test::More;
+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 getsig VMG_THREADSAFE VMG_OP_INFO_NAME VMG_OP_INFO_OBJECT/;
-
-if (VMG_THREADSAFE) {
- plan tests => 2 * 3 + 4 * (2 * 10 + 2) + 4 * (2 * 7 + 2);
+BEGIN {
+ skipall 'This Variable::Magic isn\'t thread safe' unless VMG_THREADSAFE;
+ plan tests => 2 * 3 + 2 * (2 * 10 + 2) + 2 * (2 * 7 + 2);
  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';
 }
 
 my $destroyed : shared = 0;
@@ -38,7 +46,7 @@ sub spawn_wiz {
 
  my $wiz = eval {
   wizard data    => sub { $_[1] + threads->tid() },
-         get     => sub { ++$c; 0 },
+         get     => sub { lock $c; ++$c; 0 },
          set     => sub {
                      my $op = $_[-1];
                      my $tid = threads->tid();
@@ -51,7 +59,7 @@ sub spawn_wiz {
                      }
                      0
                     },
-         free    => sub { ++$destroyed; 0 },
+         free    => sub { lock $destroyed; ++$destroyed; 0 },
          op_info => $op_info
  };
  is($@,     '',    "wizard with op_info $op_info in main thread doesn't croak");
@@ -62,22 +70,22 @@ sub spawn_wiz {
 }
 
 sub try {
- my ($dispell, $sig) = @_;
+ my ($dispell, $wiz) = @_;
  my $tid = threads->tid();
  my $a   = 3;
- my $res = eval { cast $a, $sig, sub { 5 }->() };
+ my $res = eval { cast $a, $wiz, sub { 5 }->() };
  is($@, '', "cast in thread $tid doesn't croak");
  my $b;
  eval { $b = $a };
  is($@, '', "get in thread $tid doesn't croak");
  is($b, 3,  "get in thread $tid returns the right thing");
- my $d = eval { getdata $a, $sig };
+ my $d = eval { getdata $a, $wiz };
  is($@, '',       "getdata in thread $tid doesn't croak");
  is($d, 5 + $tid, "getdata in thread $tid returns the right thing");
  eval { $a = 9 };
  is($@, '', "set in thread $tid (check opname) doesn't croak");
  if ($dispell) {
-  $res = eval { dispell $a, $sig };
+  $res = eval { dispell $a, $wiz };
   is($@, '', "dispell in thread $tid doesn't croak");
   undef $b;
   eval { $b = $a };
@@ -91,14 +99,26 @@ my $wiz_name = spawn_wiz VMG_OP_INFO_NAME;
 my $wiz_obj  = spawn_wiz VMG_OP_INFO_OBJECT;
 
 for my $dispell (1, 0) {
- for my $sig ($wiz_name, getsig($wiz_name), $wiz_obj, getsig($wiz_obj)) {
-  $c = 0;
-  $destroyed = 0;
-
-  my @t = map { threads->create(\&try, $dispell, $sig) } 1 .. 2;
+ for my $wiz ($wiz_name, $wiz_obj) {
+  {
+   lock $c;
+   $c = 0;
+  }
+  {
+   lock $destroyed;
+   $destroyed = 0;
+  }
+
+  my @t = map { threads->create(\&try, $dispell, $wiz) } 1 .. 2;
   $_->join for @t;
 
-  is($c, 2, "get triggered twice");
-  is($destroyed, (1 - $dispell) * 2, 'destructors');
+  {
+   lock $c;
+   is $c, 2, "get triggered twice";
+  }
+  {
+   lock $destroyed;
+   is $destroyed, (1 - $dispell) * 2, 'destructors';
+  }
  }
 }