Threads tests may not be able to spawn all the threads

[perl/modules/Variable-Magic.git] / t / 41-clone.t

diff --git a/t/41-clone.t b/t/41-clone.t
index d0f9bfeb9931748c71a853aee908aa952942b86b..0e47d3694819bc8c37a75cdfb411854dd7ab4aa6 100644 (file)
--- a/t/41-clone.t
+++ b/t/41-clone.t
@@ -3,42 +3,16 @@
 use strict;
 use warnings;
 
-sub skipall {
- my ($msg) = @_;
- require Test::More;
- Test::More::plan(skip_all => $msg);
-}
-
-use Config qw<%Config>;
-
-BEGIN {
- 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 lib 't/lib';
+use Variable::Magic::TestThreads;
 
-use Test::More; # after threads
+use Test::More 'no_plan';
 
 use Variable::Magic qw<
  wizard cast dispell getdata
- VMG_THREADSAFE VMG_OP_INFO_NAME VMG_OP_INFO_OBJECT
+ VMG_OP_INFO_NAME VMG_OP_INFO_OBJECT
 >;
 
-BEGIN {
- skipall 'This Variable::Magic isn\'t thread safe' unless VMG_THREADSAFE;
- plan tests => 2 * 3 + 2 * (2 * 10 + 2) + 2 * (2 * 7 + 2);
- defined and diag "Using threads $_"         for $threads::VERSION;
- defined and diag "Using threads::shared $_" for $threads::shared::VERSION;
-}
-
 my $destroyed : shared = 0;
 my $c         : shared = 0;
 
@@ -110,8 +84,8 @@ for my $dispell (1, 0) {
    $destroyed = 0;
   }
 
-  my @t = map { threads->create(\&try, $dispell, $wiz) } 1 .. 2;
-  $_->join for @t;
+  my @threads = map spawn(\&try, $dispell, $wiz), 1 .. 2;
+  $_->join for @threads;
 
   {
    lock $c;