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 0bae40abaa28a962183f05e844e0ee5c346555fe..41ce0a51494f8f10e53f97d510fd8f7ec031c4b2 100644 (file)
--- a/t/40-threads.t
+++ b/t/40-threads.t
@@ -3,29 +3,14 @@
 use strict;
 use warnings;
 
-use Config qw/%Config/;
+BEGIN { require indirect; }
 
-BEGIN {
- if (!$Config{useithreads}) {
-  require Test::More;
-  Test::More->import;
-  plan(skip_all => 'This perl wasn\'t built to support threads');
- }
-}
-
-use threads;
+use lib 't/lib';
+use VPIT::TestHelpers (
+ threads => [ 'indirect' => indirect::I_THREADSAFE ],
+);
 
-use Test::More;
-
-BEGIN {
- 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) = @_;
@@ -56,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;
     {
@@ -75,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);