Fix the logic for skipping t/30-threads.t on perls with ithreads but without threads.pm

[perl/modules/Linux-SysInfo.git] / t / 30-threads.t

diff --git a/t/30-threads.t b/t/30-threads.t
index 2bec94f8139789f0cb9f5e09490642a7f156ea8f..b7318c72195bf28bad08d924bfbbe30628039d35 100644 (file)
--- a/t/30-threads.t
+++ b/t/30-threads.t
@@ -6,17 +6,20 @@ use warnings;
 use Config qw/%Config/;
 
 BEGIN {
- if (!$Config{useithreads}) {
-  require Test::More;
-  Test::More->import; 
+ my $has_threads = do {
+  local $@;
+  $Config{useithreads} and eval "use threads; 1";
+ };
+ # Load Test::More after threads
+ require Test::More;
+ Test::More->import;
+ if ($has_threads) {
+  plan(tests => 4 * 10);
+ } else {
   plan(skip_all => 'This perl wasn\'t built to support threads');
  }
 }
 
-use threads;
-
-use Test::More tests => 4 * 10;
-
 use Linux::SysInfo qw/sysinfo/;
 
 sub try {