X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F51-threads-teardown.t;h=862717d7dffd7e44278eb7ad96d3e8ee1757f4dc;hb=295b02f98a874580b83b150d67bbe4be1a37f0b1;hp=8cb64f3c317982722994563214f87e8edd2e5ddb;hpb=3201984d539ab173c11a001792be4294af17a08c;p=perl%2Fmodules%2Fautovivification.git

diff --git a/t/51-threads-teardown.t b/t/51-threads-teardown.t
index 8cb64f3..862717d 100644
--- a/t/51-threads-teardown.t
+++ b/t/51-threads-teardown.t
@@ -3,47 +3,25 @@
 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;
 
- my $SystemRoot   = $ENV{SystemRoot};
+ my ($SystemRoot, $PATH) = @ENV{qw<SystemRoot PATH>};
  local %ENV;
  $ENV{SystemRoot} = $SystemRoot if $^O eq 'MSWin32' and defined $SystemRoot;
+ $ENV{PATH}       = $PATH       if $^O eq 'cygwin'  and defined $PATH;
 
  system { $^X } $^X, '-T', map("-I$_", @INC), '-e', $code;
 }
 
 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;