X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F50-threads.t;h=63688758a9cdb8d203db028f83940ef3d47604d6;hb=e2cf50a4ad234e0ab9844ac0cb45f2a363abe217;hp=925b8bb44b04549dfbad85bae5662409788f527c;hpb=f424a623070821112b8dd42506aa772ad19f22bb;p=perl%2Fmodules%2Fautovivification.git

diff --git a/t/50-threads.t b/t/50-threads.t
index 925b8bb..6368875 100644
--- a/t/50-threads.t
+++ b/t/50-threads.t
@@ -1,44 +1,17 @@
-#!perl -T
+#!perl
 
 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_AUTOVIVIFICATION_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 => [ 'autovivification' => 'autovivification::A_THREADSAFE()' ],
+);
 
-use threads;
+use Test::Leaner;
 
-use Test::More;
-
-BEGIN {
- require autovivification;
- skipall 'This autovivification isn\'t thread safe'
-                                        unless autovivification::A_THREADSAFE();
-}
-
-my ($threads, $runs);
-BEGIN {
- $threads = 10;
- $runs    = 2;
-}
-
-BEGIN {
- plan tests => $threads * $runs * 3 * (1 + 2);
- defined and diag "Using threads $_" for $threads::VERSION;
-}
+my $threads = 10;
+my $runs    = 2;
 
 {
  no autovivification;
@@ -66,7 +39,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}';
@@ -90,5 +63,10 @@ SKIP:
  }
 }
 
-my @t = map threads->create(\&try), 1 .. $threads;
-$_->join for @t;
+my @threads = map spawn(\&try), 1 .. $threads;
+
+$_->join for @threads;
+
+pass 'done';
+
+done_testing(scalar(@threads) * $runs * 3 * (1 + 2) + 1);