X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Findirect.git;a=blobdiff_plain;f=t%2F40-threads.t;h=3f2fe250dd9bd88e4253720d83096263c10513c4;hp=4263ea59f950e1cc87476b111af3b36629000b3a;hb=b9dca634c59b11dc31a3d2eca413152ac7c92791;hpb=f23fcd5b540fd0b7a075ba6c71d7e6d3245a7dd5

diff --git a/t/40-threads.t b/t/40-threads.t
index 4263ea5..3f2fe25 100644
--- a/t/40-threads.t
+++ b/t/40-threads.t
@@ -3,33 +3,10 @@
 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_INDIRECT_TEST_THREADS} ? 1 : !1;
- 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;
-}
-
-use threads;
+use lib 't/lib';
+use indirect::TestThreads;
 
-use Test::More;
-
-BEGIN {
- delete $ENV{PERL_INDIRECT_PM_DISABLE};
- require indirect;
- skipall 'This indirect isn\'t thread safe' unless indirect::I_THREADSAFE();
- plan tests => 10 * 2 * (2 + 3);
- defined and diag "Using threads $_" for $threads::VERSION;
-}
+use Test::Leaner;
 
 sub expect {
  my ($pkg) = @_;
@@ -60,7 +37,7 @@ sub expect {
 SKIP:
    {
     skip 'Hints aren\'t propagated into eval STRING below perl 5.10' => 3
-                                                             unless $] >= 5.010;
+                                                           unless "$]" >= 5.010;
     my $class = "Pineapple$tid";
     my @warns;
     {
@@ -79,5 +56,10 @@ SKIP:
  }
 }
 
-my @t = map threads->create(\&try), 1 .. 10;
-$_->join for @t;
+my @threads = map spawn(\&try), 1 .. 10;
+
+$_->join for @threads;
+
+pass 'done';
+
+done_testing(scalar(@threads) * 2 * (2 + 3) + 1);