X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Findirect.git;a=blobdiff_plain;f=t%2F41-threads-teardown.t;h=9de009fb0ba33b458f07547d858b5a12bb4591e6;hp=b2186e8ee64b216ad231ec01e1e59deae1adcd4b;hb=eab9532b534e1c2efca5410ae4502af7ce43f941;hpb=ca6c9d6f907915ef07a55bd86e0b1333cc8ac649

diff --git a/t/41-threads-teardown.t b/t/41-threads-teardown.t
index b2186e8..9de009f 100644
--- a/t/41-threads-teardown.t
+++ b/t/41-threads-teardown.t
@@ -3,50 +3,31 @@
 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 indirect::TestThreads;
 
-use Test::More;
-
-BEGIN {
- delete $ENV{PERL_INDIRECT_PM_DISABLE};
- require indirect;
- if (indirect::I_THREADSAFE()) {
-  plan tests => 1;
-  defined and diag "Using threads $_" for $threads::VERSION;
- } else {
-  plan skip_all => 'This indirect 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, @expected);
   BEGIN {
    $code = 2;
-   @expected = qw/X Z/;
+   @expected = qw<X Z>;
   }
   sub cb { --$code if $_[0] eq shift(@expected) || q{DUMMY} }
   use threads;