Port thread tests to the new VPIT::TestHelpers interface

The new 'force threads test' environment variable is
PERL_FORCE_TEST_THREADS.

diff --git a/MANIFEST b/MANIFEST
index 2df0f95bdf479725a8f6f473d3393dafa11b0807..e474b4b1b82fba83faf5f71f205810710fdb81d4 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -45,6 +45,5 @@ t/lib/VPIT/TestHelpers.pm
 t/lib/Variable/Magic/TestDestroyRequired.pm
 t/lib/Variable/Magic/TestGlobalDestruction.pm
 t/lib/Variable/Magic/TestScopeEnd.pm
-t/lib/Variable/Magic/TestThreads.pm
 t/lib/Variable/Magic/TestValue.pm
 t/lib/Variable/Magic/TestWatcher.pm

diff --git a/t/40-threads.t b/t/40-threads.t
index 1a3d5ab888324d9336138b6cc56190ce56c25f51..7f55f22fc43cea8ee85dcf3301ae06a3b6a14290 100644 (file)
--- a/t/40-threads.t
+++ b/t/40-threads.t
@@ -3,16 +3,18 @@
 use strict;
 use warnings;
 
-use lib 't/lib';
-use Variable::Magic::TestThreads;
-
-use Test::More 'no_plan';
-
 use Variable::Magic qw<
  wizard cast dispell getdata
  VMG_OP_INFO_NAME VMG_OP_INFO_OBJECT
 >;
 
+use lib 't/lib';
+use VPIT::TestHelpers (
+ threads => [ 'Variable::Magic' => Variable::Magic::VMG_THREADSAFE ],
+);
+
+use Test::Leaner 'no_plan';
+
 my $destroyed : shared = 0;
 
 sub try {

diff --git a/t/41-clone.t b/t/41-clone.t
index 6214741724b8e72c2d4123891873b9b9686735d4..7528bec44228c29c1a24c452b37b88f6307824d2 100644 (file)
--- a/t/41-clone.t
+++ b/t/41-clone.t
@@ -3,16 +3,18 @@
 use strict;
 use warnings;
 
-use lib 't/lib';
-use Variable::Magic::TestThreads;
-
-use Test::More 'no_plan';
-
 use Variable::Magic qw<
  wizard cast dispell getdata
  VMG_OP_INFO_NAME VMG_OP_INFO_OBJECT
 >;
 
+use lib 't/lib';
+use VPIT::TestHelpers (
+ threads => [ 'Variable::Magic' => Variable::Magic::VMG_THREADSAFE ],
+);
+
+use Test::Leaner 'no_plan';
+
 my $destroyed : shared = 0;
 my $c         : shared = 0;
 

diff --git a/t/lib/Variable/Magic/TestThreads.pm b/t/lib/Variable/Magic/TestThreads.pm
deleted file mode 100644 (file)
index e67ea3f..0000000
--- a/t/lib/Variable/Magic/TestThreads.pm
+++ /dev/null
@@ -1,54 +0,0 @@
-package Variable::Magic::TestThreads;
-
-use strict;
-use warnings;
-
-use Config qw<%Config>;
-
-use Variable::Magic qw<VMG_THREADSAFE>;
-
-use VPIT::TestHelpers;
-
-sub diag {
- require Test::More;
- Test::More::diag($_) for @_;
-}
-
-sub import {
- shift;
-
- skip_all 'This Variable::Magic isn\'t thread safe' unless VMG_THREADSAFE;
-
- my $force = $ENV{PERL_VARIABLE_MAGIC_TEST_THREADS} ? 1 : !1;
- skip_all 'This perl wasn\'t built to support threads'
-                                                    unless $Config{useithreads};
- skip_all 'perl 5.13.4 required to test thread safety'
-                                             unless $force or "$]" >= 5.013_004;
-
- load_or_skip_all('threads',         $force ? '0' : '1.67', [ ]);
- load_or_skip_all('threads::shared', $force ? '0' : '1.14', [ ]);
-
- my %exports = (
-  spawn => \&spawn,
- );
-
- my $pkg = caller;
- while (my ($name, $code) = each %exports) {
-  no strict 'refs';
-  *{$pkg.'::'.$name} = $code;
- }
-}
-
-sub spawn {
- local $@;
- my @diag;
- my $thread = eval {
-  local $SIG{__WARN__} = sub { push @diag, "Thread creation warning: @_" };
-  threads->create(@_);
- };
- push @diag, "Thread creation error: $@" if $@;
- diag(@diag) if @diag;
- return $thread ? $thread : ();
-}
-
-1;