Port module loading in tests to VPIT::TestHelpers

diff --git a/t/63-uplevel-ctl.t b/t/63-uplevel-ctl.t
index fda4410f8791538e44e3e030b71f069acd43c713..6b1ec188480053cb683018af750a0a076dcffd0a 100644 (file)
--- a/t/63-uplevel-ctl.t
+++ b/t/63-uplevel-ctl.t
@@ -223,7 +223,7 @@ SKIP: {
  like $@, qr/^tomato at \Q$0\E line $line/, "$desc (third): correct exception";
 }
 
-my $has_B = do { local $@; eval 'require B; 1' };
+my $has_B = do { local $@; eval { require B; 1 } };
 
 sub check_depth {
  my ($code, $expected, $desc) = @_;

diff --git a/t/lib/Scope/Upper/TestThreads.pm b/t/lib/Scope/Upper/TestThreads.pm
index 624065283f1b0bc06b396b6a1d8c05f2510b1c9b..71b4e621fdc3610c60664b6c411476ab9b2b2b0a 100644 (file)
--- a/t/lib/Scope/Upper/TestThreads.pm
+++ b/t/lib/Scope/Upper/TestThreads.pm
@@ -7,11 +7,7 @@ use Config qw<%Config>;
 
 use Scope::Upper qw<SU_THREADSAFE>;
 
-sub skipall {
- my ($msg) = @_;
- require Test::Leaner;
- Test::Leaner::plan(skip_all => $msg);
-}
+use VPIT::TestHelpers;
 
 sub diag {
  require Test::Leaner;
@@ -21,34 +17,23 @@ sub diag {
 sub import {
  shift;
 
- skipall 'This Scope::Upper isn\'t thread safe' unless SU_THREADSAFE;
+ skip_all 'This Scope::Upper isn\'t thread safe' unless SU_THREADSAFE;
 
  my $force = $ENV{PERL_SCOPE_UPPER_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.013_004;
 
- 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;
-
- my $has_time_hires = do {
-  local $@;
-  eval { require Time::HiRes; 1 };
- };
+ load_or_skip('threads', $force ? '0' : '1.67', [ ],
+              'required to test thread safety');
 
  my %exports = (
   spawn => \&spawn,
  );
 
  my $usleep;
- if ($has_time_hires) {
+ if (do { local $@; eval { require Time::HiRes; 1 } }) {
   defined and diag "Using Time::HiRes $_" for $Time::HiRes::VERSION;
   $exports{usleep} = \&Time::HiRes::usleep;
  } else {