X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F41-clone.t;h=0e47d3694819bc8c37a75cdfb411854dd7ab4aa6;hb=800e9f939f181af9766c3a3024ac9f57b9799510;hp=0e9c4d1ec3a94d114d869c6a277c1dac1ce68028;hpb=b62747ec94e8fc6500fa3140e457a436e8a7b12f;p=perl%2Fmodules%2FVariable-Magic.git

diff --git a/t/41-clone.t b/t/41-clone.t
index 0e9c4d1..0e47d36 100644
--- a/t/41-clone.t
+++ b/t/41-clone.t
@@ -3,37 +3,15 @@
 use strict;
 use warnings;
 
-sub skipall {
- my ($msg) = @_;
- require Test::More;
- Test::More::plan(skip_all => $msg);
-}
-
-use Config qw/%Config/;
-
-BEGIN {
- my $t_v  = '1.67';
- my $ts_v = '1.14';
- skipall 'This perl wasn\'t built to support threads'
-                                                    unless $Config{useithreads};
- 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 Test::More; # after threads
+use lib 't/lib';
+use Variable::Magic::TestThreads;
 
-use Variable::Magic qw/wizard cast dispell getdata getsig VMG_THREADSAFE VMG_OP_INFO_NAME VMG_OP_INFO_OBJECT/;
+use Test::More 'no_plan';
 
-BEGIN {
- skipall 'This Variable::Magic isn\'t thread safe' unless VMG_THREADSAFE;
- plan tests => 2 * 3 + 4 * (2 * 10 + 2) + 4 * (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;
-}
+use Variable::Magic qw<
+ wizard cast dispell getdata
+ VMG_OP_INFO_NAME VMG_OP_INFO_OBJECT
+>;
 
 my $destroyed : shared = 0;
 my $c         : shared = 0;
@@ -67,22 +45,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 };
@@ -96,7 +74,7 @@ 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)) {
+ for my $wiz ($wiz_name, $wiz_obj) {
   {
    lock $c;
    $c = 0;
@@ -106,8 +84,8 @@ for my $dispell (1, 0) {
    $destroyed = 0;
   }
 
-  my @t = map { threads->create(\&try, $dispell, $sig) } 1 .. 2;
-  $_->join for @t;
+  my @threads = map spawn(\&try, $dispell, $wiz), 1 .. 2;
+  $_->join for @threads;
 
   {
    lock $c;