Port module loading in tests to VPIT::TestHelpers

diff --git a/t/42-deparse.t b/t/42-deparse.t
index 6b3d1e047f85a6efca46b8b1ecfaf86215b128ff..436b03d2bc4d9472ea1f1b5a8ca61361c6bab4b4 100644 (file)
--- a/t/42-deparse.t
+++ b/t/42-deparse.t
@@ -5,11 +5,13 @@ use warnings;
 
 use Test::More;
 
-if (eval 'use B::Deparse; 1') {
- plan tests => 2;
-} else {
- plan skip_all => 'B::Deparse is not available';
-}
+use lib 't/lib';
+use VPIT::TestHelpers;
+
+load_or_skip('B::Deparse', undef, [ ],
+             'required to test round-trip deparsing compatibility');
+
+plan tests => 2;
 
 my $bd = B::Deparse->new;
 

diff --git a/t/lib/autovivification/TestThreads.pm b/t/lib/autovivification/TestThreads.pm
index 2fe58e02635523f44f4a082c0e7447924781e908..3e0c7c951e64f6be4b88ac6d3f427768bfd507b5 100644 (file)
--- a/t/lib/autovivification/TestThreads.pm
+++ b/t/lib/autovivification/TestThreads.pm
@@ -5,39 +5,24 @@ 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'
+ skip_all '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;
-
- defined and diag "Using threads $_" for $threads::VERSION;
+ load_or_skip('threads', $force ? '0' : '1.67', [ ],
+              'required to test thread safety');
 
  my %exports = (
   spawn => \&spawn,