Threads tests may not be able to spawn all the threads

[perl/modules/Variable-Magic.git] / t / 40-threads.t

diff --git a/t/40-threads.t b/t/40-threads.t
index f67dfc313bf182f6f46229684a667c0f956011dd..3b850e3c89236c7eb4e8db9a359421d7fcc14b5b 100644 (file)
--- a/t/40-threads.t
+++ b/t/40-threads.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 => (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;
 
 sub try {
@@ -99,9 +73,9 @@ for my $dispell (1, 0) {
   $destroyed = 0;
  }
 
- my @t = map { threads->create(\&try, $dispell, $_) }
+ my @threads = map spawn(\&try, $dispell, $_),
                               (VMG_OP_INFO_NAME) x 2, (VMG_OP_INFO_OBJECT) x 2;
- $_->join for @t;
+ $_->join for @threads;
 
  {
   lock $destroyed;