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

diff --git a/t/51-threads-teardown.t b/t/51-threads-teardown.t
index d769fb6..862717d 100644
--- a/t/51-threads-teardown.t
+++ b/t/51-threads-teardown.t
@@ -3,43 +3,25 @@
 use strict;
 use warnings;
 
-use Config qw/%Config/;
-
-BEGIN {
- if (!$Config{useithreads}) {
-  require Test::More;
-  Test::More->import;
-  plan(skip_all => 'This perl wasn\'t built to support threads');
- }
-}
-
-use threads;
+use lib 't/lib';
+use autovivification::TestThreads;
 
-use Test::More;
-
-BEGIN {
- require autovivification;
- if (autovivification::A_THREADSAFE()) {
-  plan tests => 1;
-  defined and diag "Using threads $_" for $threads::VERSION;
- } else {
-  plan skip_all => 'This autovivification isn\'t thread safe';
- }
-}
+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;