X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F40-threads.t;h=a6a38aeeab5edcfb98b2b33e319001bfde292585;hb=8845e141913781c0e0b4b928a38fd23da1752f6b;hp=16af4ca9656a0a72f282e39d71ca33b07961a7e9;hpb=e11d9a3efc1dcc5648202bd7651a982477bbc587;p=perl%2Fmodules%2Findirect.git

diff --git a/t/40-threads.t b/t/40-threads.t
index 16af4ca..a6a38ae 100644
--- a/t/40-threads.t
+++ b/t/40-threads.t
@@ -1,32 +1,12 @@
-#!perl -T
+#!perl
 
 use strict;
 use warnings;
 
-use Config qw/%Config/;
+use lib 't/lib';
+use VPIT::TestHelpers threads => [ 'indirect' => 'indirect::I_THREADSAFE()' ];
 
-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;
-
-BEGIN {
- delete $ENV{PERL_INDIRECT_PM_DISABLE};
- require indirect;
- if (indirect::I_THREADSAFE()) {
-  plan tests => 10 * 2 * (2 + 3);
-  defined and diag "Using threads $_" for $threads::VERSION;
- } else {
-  plan skip_all => 'This indirect isn\'t thread safe';
- }
-}
+use Test::Leaner;
 
 sub expect {
  my ($pkg) = @_;
@@ -57,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;
     {
@@ -76,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);