Threads tests may not be able to spawn all the threads

[perl/modules/Lexical-Types.git] / t / 30-threads.t

diff --git a/t/30-threads.t b/t/30-threads.t
index 3f46124d0792b71fca8f3d3512ffe63fe125ba53..73359c3da8c727c364c7eecd9f01b92eed6ce327 100644 (file)
--- a/t/30-threads.t
+++ b/t/30-threads.t
@@ -3,29 +3,13 @@
 use strict;
 use warnings;
 
-use Config qw/%Config/;
+use lib 't/lib';
+use Lexical::Types::TestThreads;
 
-BEGIN {
- if (!$Config{useithreads}) {
-  require Test::More;
-  Test::More->import;
-  plan(skip_all => 'This perl wasn\'t built to support threads');
- }
-}
-
-use threads;
-
-use Test::More;
+use Test::More 'no_plan';
 
-BEGIN {
- require Lexical::Types;
- if (Lexical::Types::LT_THREADSAFE()) {
-  plan tests => 10 * 2 * 3 * (1 + 2);
-  defined and diag "Using threads $_" for $threads::VERSION;
- } else {
-  plan skip_all => 'This Lexical::Types isn\'t thread safe';
- }
-}
+my $threads = 10;
+my $runs    = 2;
 
 {
  package Lexical::Types::Test::Tag;
@@ -34,6 +18,7 @@ BEGIN {
   my $tid = threads->tid();
   my ($file, $line) = (caller(0))[1, 2];
   my $where = "at $file line $line in thread $tid";
+  local $Test::Builder::Level = $Test::Builder::Level + 1;
   Test::More::is($_[0], __PACKAGE__, "base type is correct $where");
   Test::More::is($_[2], 'Tag', "original type is correct $where");
   $_[1] = $tid;
@@ -48,7 +33,7 @@ use Lexical::Types as => 'Lexical::Types::Test::';
 sub try {
  my $tid = threads->tid();
 
- for (1 .. 2) {
+ for (1 .. $runs) {
   my Tag $t;
   is $t, $tid, "typed lexical correctly initialized at run $_ in thread $tid";
 
@@ -62,7 +47,7 @@ EVALD
 SKIP:
   {
    skip 'Hints aren\'t propagated into eval STRING below perl 5.10' => 3
-                                                             unless $] >= 5.010;
+                                                           unless "$]" >= 5.010;
    eval <<'EVALD';
     my Tag $t3;
     is $t3, $tid, "typed lexical correctly initialized in eval (propagated) at run $_ in thread $tid"
@@ -71,5 +56,8 @@ EVALD
  }
 }
 
-my @t = map threads->create(\&try), 1 .. 10;
+my @t = map spawn(\&try), 1 .. $threads;
+
 $_->join for @t;
+
+pass 'done';