Threads tests may not be able to spawn all the threads

[perl/modules/autovivification.git] / t / 51-threads-teardown.t

diff --git a/t/51-threads-teardown.t b/t/51-threads-teardown.t
index d825f91bb5c2689e852af1a40211b192af4b3f0d..a688df8e8a92d3a1fc42278755438da9d96eaa85 100644 (file)
--- a/t/51-threads-teardown.t
+++ b/t/51-threads-teardown.t
@@ -3,33 +3,10 @@
 use strict;
 use warnings;
 
-sub skipall {
- my ($msg) = @_;
- require Test::More;
- Test::More::plan(skip_all => $msg);
-}
-
-use Config qw/%Config/;
-
-BEGIN {
- my $force = $ENV{PERL_AUTOVIVIFICATION_TEST_THREADS} ? 1 : !1;
- skipall 'This perl wasn\'t built to support threads'
-                                                    unless $Config{useithreads};
- skipall 'perl 5.13.4 required to test thread safety'
-                                                unless $force or $] >= 5.013004;
-}
+use lib 't/lib';
+use autovivification::TestThreads;
 
-use threads;
-
-use Test::More;
-
-BEGIN {
- require autovivification;
- skipall 'This autovivification isn\'t thread safe'
-                                        unless autovivification::A_THREADSAFE();
- plan tests => 1;
- defined and diag "Using threads $_" for $threads::VERSION;
-}
+use Test::Leaner tests => 1;
 
 sub run_perl {
  my $code = shift;
@@ -43,7 +20,7 @@ sub run_perl {
 
 SKIP:
 {
- skip 'Fails on 5.8.2 and lower' => 1 if $] <= 5.008002;
+ skip 'Fails on 5.8.2 and lower' => 1 if "$]" <= 5.008002;
 
  my $status = run_perl <<' RUN';
   my $code = 1 + 2 + 4;