Test helper modules version output overhaul

diff --git a/t/10-join.t b/t/10-join.t
index df54d311efea7d741d5bad066ee9536bc2f32f40..0a4ea4de61b8c4bda0267b87382825f38e75727c 100644 (file)
--- a/t/10-join.t
+++ b/t/10-join.t
@@ -18,10 +18,12 @@ use threads::shared;
 
 use Test::More tests => 5 * (2 + 2) + 1;
 
-use Thread::Cleanup;
+BEGIN {
+ defined and diag "Using threads $_"         for $threads::VERSION;
+ defined and diag "Using threads::shared $_" for $threads::shared::VERSION;
+}
 
-diag "Using threads $threads::VERSION";
-diag "Using threads::shared $threads::shared::VERSION";
+use Thread::Cleanup;
 
 my %called : shared;
 my %nums   : shared;

diff --git a/t/11-detach.t b/t/11-detach.t
index 620af76a3fdf01a32d51a5b6d8d1ecf391648386..a91d1394dd73a504750d6d6273e8d5df903306af 100644 (file)
--- a/t/11-detach.t
+++ b/t/11-detach.t
@@ -18,10 +18,12 @@ use threads::shared;
 
 use Test::More tests => 5 * (2 + 2 + 1) + 1;
 
-use Thread::Cleanup;
+BEGIN {
+ defined and diag "Using threads $_"         for $threads::VERSION;
+ defined and diag "Using threads::shared $_" for $threads::shared::VERSION;
+}
 
-diag "Using threads $threads::VERSION";
-diag "Using threads::shared $threads::shared::VERSION";
+use Thread::Cleanup;
 
 my %called : shared;
 my %nums   : shared;

diff --git a/t/20-recurse.t b/t/20-recurse.t
index 2e639623c1ab9dd67255bf1e160da4f0c091cc4b..afa72e46a04a2c312790be99aeed4c449f03b331 100644 (file)
--- a/t/20-recurse.t
+++ b/t/20-recurse.t
@@ -24,10 +24,13 @@ BEGIN {
 
 use Test::More tests => (($num ** ($depth + 1) - 1) / ($num - 1) - 1 ) * (2 + 2) + 1;
 
+BEGIN {
+ defined and diag "Using threads $_"         for $threads::VERSION;
+ defined and diag "Using threads::shared $_" for $threads::shared::VERSION;
+}
+
 use Thread::Cleanup;
 
-diag "Using threads $threads::VERSION";
-diag "Using threads::shared $threads::shared::VERSION";
 diag 'This will leak some scalars';
 
 our $x = -1;