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 d2c536eed190a11a0be6ebc4f1c748f5374bfc61..3b850e3c89236c7eb4e8db9a359421d7fcc14b5b 100644 (file)
--- a/t/40-threads.t
+++ b/t/40-threads.t
@@ -3,42 +3,24 @@
 use strict;
 use warnings;
 
-use Config qw/%Config/;
+use lib 't/lib';
+use Variable::Magic::TestThreads;
 
-BEGIN {
- if (!$Config{useithreads}) {
-  require Test::More;
-  Test::More->import;
-  plan(skip_all => 'This perl wasn\'t built to support threads');
- }
-}
-
-use threads; # Before Test::More
-use threads::shared;
-
-use Test::More;
+use Test::More 'no_plan';
 
-use Variable::Magic qw/wizard cast dispell getdata VMG_THREADSAFE VMG_OP_INFO_NAME VMG_OP_INFO_OBJECT/;
-
-if (VMG_THREADSAFE) {
- plan tests => 2 * (4 * 18 + 1) + 2 * (4 * 13 + 1);
- 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';
-}
+use Variable::Magic qw<
+ wizard cast dispell getdata
+ VMG_OP_INFO_NAME VMG_OP_INFO_OBJECT
+>;
 
 my $destroyed : shared = 0;
 
 sub try {
- my ($dispell, $sig, $op_info) = @_;
+ my ($dispell, $op_info) = @_;
  my $tid = threads->tid();
  my $c   = 0;
  my $wiz = eval {
   wizard data    => sub { $_[1] + $tid },
-         sig     => $sig,
          get     => sub { ++$c; 0 },
          set     => sub {
                      my $op = $_[-1];
@@ -86,19 +68,17 @@ sub try {
 }
 
 for my $dispell (1, 0) {
- for my $sig (undef, Variable::Magic::gensig()) {
-  {
-   lock $destroyed;
-   $destroyed = 0;
-  }
+ {
+  lock $destroyed;
+  $destroyed = 0;
+ }
 
-  my @t = map { threads->create(\&try, $dispell, $sig, $_) }
-                               (VMG_OP_INFO_NAME) x 2, (VMG_OP_INFO_OBJECT) x 2;
-  $_->join for @t;
+ my @threads = map spawn(\&try, $dispell, $_),
+                              (VMG_OP_INFO_NAME) x 2, (VMG_OP_INFO_OBJECT) x 2;
+ $_->join for @threads;
 
-  {
-   lock $destroyed;
-   is $destroyed, (1 - $dispell) * 4, 'destructors';
-  }
+ {
+  lock $destroyed;
+  is $destroyed, (1 - $dispell) * 4, 'destructors';
  }
 }