Port threads tests to the new VPIT::TestHelpers interface

[perl/modules/indirect.git] / t / 40-threads.t

diff --git a/t/40-threads.t b/t/40-threads.t
index 4263ea59f950e1cc87476b111af3b36629000b3a..41ce0a51494f8f10e53f97d510fd8f7ec031c4b2 100644 (file)
--- a/t/40-threads.t
+++ b/t/40-threads.t
@@ -3,33 +3,14 @@
 use strict;
 use warnings;
 
-sub skipall {
- my ($msg) = @_;
- require Test::More;
- Test::More::plan(skip_all => $msg);
-}
-
-use Config qw<%Config>;
+BEGIN { require indirect; }
 
-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 lib 't/lib';
+use VPIT::TestHelpers (
+ threads => [ 'indirect' => indirect::I_THREADSAFE ],
+);
 
-use threads;
-
-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 +41,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 +60,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);