X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F41-clone.t;h=a35a2a57303ee8c811d1971dbba66c0be9a97379;hb=33e50e22dc4df6fd53e90e57e4bab26b46a315cb;hp=1bfe6b5b3f5f53add4816fbf4aae2a131e6b936e;hpb=75e0226fc114601c5e10d253d55e94e201249151;p=perl%2Fmodules%2FVariable-Magic.git

diff --git a/t/41-clone.t b/t/41-clone.t
index 1bfe6b5..a35a2a5 100644
--- a/t/41-clone.t
+++ b/t/41-clone.t
@@ -1,73 +1,111 @@
-#!perl -T
+#!perl
 
 use strict;
 use warnings;
 
-use lib 't/lib';
-use Variable::Magic::TestThreads;
-
-use Test::More 'no_plan';
-
 use Variable::Magic qw<
  wizard cast dispell getdata
  VMG_OP_INFO_NAME VMG_OP_INFO_OBJECT
 >;
 
+use lib 't/lib';
+use VPIT::TestHelpers (
+ threads => [ 'Variable::Magic' => 'Variable::Magic::VMG_THREADSAFE()' ],
+);
+
+use Test::Leaner 'no_plan';
+
 my $destroyed : shared = 0;
 my $c         : shared = 0;
 
 sub spawn_wiz {
  my ($op_info) = @_;
 
+ my $desc = "wizard with op_info $op_info in main thread";
+
+ local $@;
  my $wiz = eval {
-  wizard data    => sub { $_[1] + threads->tid() },
-         get     => sub { lock $c; ++$c; 0 },
-         set     => sub {
-                     my $op = $_[-1];
-                     my $tid = threads->tid();
-                     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 { lock $destroyed; ++$destroyed; 0 },
-         op_info => $op_info
+  wizard(
+   data    => sub { $_[1] + threads->tid() },
+   get     => sub { lock $c; ++$c; 0 },
+   set     => sub {
+    my $op = $_[-1];
+    my $tid = threads->tid();
+
+     my $assign_op    = ("$]" < 5.037_003) ? 'sassign': 'padsv_store';
+     my $assign_op_cl = ("$]" < 5.037_003) ? 'B::BINOP': 'B::UNOP';
+
+    if ($op_info == VMG_OP_INFO_OBJECT) {
+     is_deeply { class => ref($op),   name => $op->name },
+               { class => $assign_op_cl, name => $assign_op },
+               "op object in thread $tid is correct";
+    } else {
+     is $op, $assign_op, "op name in thread $tid is correct";
+    }
+
+    return 0
+   },
+   free    => sub { lock $destroyed; ++$destroyed; 0 },
+   op_info => $op_info,
+  );
  };
- is($@,     '',    "wizard with op_info $op_info in main thread doesn't croak");
- isnt($wiz, undef, "wizard with op_info $op_info in main thread is defined");
- is($c,     0,     "wizard with op_info $op_info in main thread doesn't trigger magic");
+ is $@,     '',    "$desc doesn't croak";
+ isnt $wiz, undef, "$desc is defined";
+ is $c,     0,     "$desc doesn't trigger magic";
 
  return $wiz;
 }
 
 sub try {
  my ($dispell, $wiz) = @_;
- my $tid = threads->tid();
- my $a   = 3;
- 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, $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, $wiz };
-  is($@, '', "dispell in thread $tid doesn't croak");
-  undef $b;
+ my $tid = threads->tid;
+
+ my $a = 3;
+
+ {
+  local $@;
+  my $res = eval { cast $a, $wiz, sub { 5 }->() };
+  is $@, '', "cast in thread $tid doesn't croak";
+ }
+
+ {
+  local $@;
+  my $b;
   eval { $b = $a };
-  is($@, '', "get in thread $tid after dispell doesn't croak");
-  is($b, 9,  "get in thread $tid after dispell returns the right thing");
+  is $@, '', "get in thread $tid doesn't croak";
+  is $b, 3,  "get in thread $tid returns the right thing";
  }
- return; # Ugly if not here
+
+ {
+  local $@;
+  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";
+ }
+
+ {
+  local $@;
+  eval { $a = 9 };
+  is $@, '', "set in thread $tid (check opname) doesn't croak";
+ }
+
+ if ($dispell) {
+  {
+   local $@;
+   my $res = eval { dispell $a, $wiz };
+   is $@, '', "dispell in thread $tid doesn't croak";
+  }
+
+  {
+   local $@;
+   my $b;
+   eval { $b = $a };
+   is $@, '', "get in thread $tid after dispell doesn't croak";
+   is $b, 9,  "get in thread $tid after dispell returns the right thing";
+  }
+ }
+
+ return 1;
 }
 
 my $wiz_name = spawn_wiz VMG_OP_INFO_NAME;
@@ -84,16 +122,21 @@ for my $dispell (1, 0) {
    $destroyed = 0;
   }
 
+  my $completed = 0;
+
   my @threads = map spawn(\&try, $dispell, $wiz), 1 .. 2;
-  $_->join for @threads;
+  for my $thr (@threads) {
+   my $res = $thr->join;
+   $completed += $res if defined $res;
+  }
 
   {
    lock $c;
-   is $c, 2, "get triggered twice";
+   is $c, $completed, "get triggered twice";
   }
   {
    lock $destroyed;
-   is $destroyed, (1 - $dispell) * 2, 'destructors';
+   is $destroyed, (1 - $dispell) * $completed, 'destructors';
   }
  }
 }