X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2Flib%2Fautovivification%2FTestThreads.pm;h=25f2ae699378f693253723fe364b81c04d2a85c5;hb=7839df4d069fb2962a189f08bf7c92ff63d261fa;hp=2fe58e02635523f44f4a082c0e7447924781e908;hpb=bff16fe7ea455b013bb0e681f2852f6c11d72636;p=perl%2Fmodules%2Fautovivification.git

diff --git a/t/lib/autovivification/TestThreads.pm b/t/lib/autovivification/TestThreads.pm
index 2fe58e0..25f2ae6 100644
--- a/t/lib/autovivification/TestThreads.pm
+++ b/t/lib/autovivification/TestThreads.pm
@@ -5,39 +5,23 @@ use warnings;
 
 use Config qw<%Config>;
 
-sub skipall {
- my ($msg) = @_;
- require Test::Leaner;
- Test::Leaner::plan(skip_all => $msg);
-}
-
-sub diag {
- require Test::Leaner;
- Test::Leaner::diag(@_);
-}
+use VPIT::TestHelpers;
 
 sub import {
  shift;
 
  require autovivification;
 
- skipall 'This autovivification isn\'t thread safe'
+ skip_all 'This autovivification isn\'t thread safe'
                                         unless autovivification::A_THREADSAFE();
 
  my $force = $ENV{PERL_AUTOVIVIFICATION_TEST_THREADS} ? 1 : !1;
- skipall 'This perl wasn\'t built to support threads'
+ skip_all '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;
-
- my $t_v = $force ? '0' : '1.67';
- my $has_threads =  do {
-  local $@;
-  eval "use threads $t_v; 1";
- };
- skipall "threads $t_v required to test thread safety" unless $has_threads;
+ skip_all 'perl 5.13.4 required to test thread safety'
+                                             unless $force or "$]" >= 5.013_004;
 
- defined and diag "Using threads $_" for $threads::VERSION;
+ load_or_skip_all('threads', $force ? '0' : '1.67', [ ]);
 
  my %exports = (
   spawn => \&spawn,