X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F31-threads-teardown.t;h=741d2242e506b8216c4dd9b2ab716522298cf813;hb=55716e9a7414ca5da96259d66fd0f20c1cbba893;hp=34e61acd2a75543af35eed20019f57a7c78a932c;hpb=61f64dfa5fa4f435e6cd854d22e4325ef1eb0068;p=perl%2Fmodules%2FLexical-Types.git

diff --git a/t/31-threads-teardown.t b/t/31-threads-teardown.t
index 34e61ac..741d224 100644
--- a/t/31-threads-teardown.t
+++ b/t/31-threads-teardown.t
@@ -3,48 +3,23 @@
 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_LEXICAL_TYPES_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 Lexical::Types::TestThreads;
 
-use threads;
-
-use Test::More;
-
-BEGIN {
- require Lexical::Types;
- skipall 'This Lexical::Types isn\'t thread safe'
-                                         unless Lexical::Types::LT_THREADSAFE();
- plan tests => 1;
- defined and diag "Using threads $_" for $threads::VERSION;
-}
+use Test::More 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;
-
  my $status = run_perl <<' RUN';
   { package IntX; package IntY; package IntZ; }
   my ($code, @expected);