X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F50-threads.t;h=e8e7cfe3d6a057a4e5da5ea497faf417b4ad436d;hb=bff16fe7ea455b013bb0e681f2852f6c11d72636;hp=99aa1ada3ca263c932c851f4cccf20f252ae47f8;hpb=120d12f635bf0ef0f334f463c455a0d2082db4e9;p=perl%2Fmodules%2Fautovivification.git

diff --git a/t/50-threads.t b/t/50-threads.t
index 99aa1ad..e8e7cfe 100644
--- a/t/50-threads.t
+++ b/t/50-threads.t
@@ -3,29 +3,13 @@
 use strict;
 use warnings;
 
-use Config qw/%Config/;
+use lib 't/lib';
+use autovivification::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::Leaner;
 
-use Test::More;
-
-BEGIN {
- require autovivification;
- if (autovivification::A_THREADSAFE()) {
-  plan tests => 10 * 2 * 3 * (1 + 2);
-  defined and diag "Using threads $_" for $threads::VERSION;
- } else {
-  plan skip_all => 'This autovivification isn\'t thread safe';
- }
-}
+my $threads = 10;
+my $runs    = 2;
 
 {
  no autovivification;
@@ -33,7 +17,7 @@ BEGIN {
  sub try {
   my $tid = threads->tid();
 
-  for my $run (1 .. 2) {
+  for my $run (1 .. $runs) {
    {
     my $x;
     my $y = $x->{foo};
@@ -53,7 +37,7 @@ BEGIN {
 SKIP:
    {
     skip 'Hints aren\'t propagated into eval STRING below perl 5.10' => 3 * 2
-                                                             unless $] >= 5.010;
+                                                           unless "$]" >= 5.010;
     {
      my $x;
      eval 'my $y = $x->{foo}';
@@ -77,5 +61,10 @@ SKIP:
  }
 }
 
-my @t = map threads->create(\&try), 1 .. 10;
-$_->join for @t;
+my @threads = map spawn(\&try), 1 .. $threads;
+
+$_->join for @threads;
+
+pass 'done';
+
+done_testing(scalar(@threads) * $runs * 3 * (1 + 2) + 1);