X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Findirect.git;a=blobdiff_plain;f=t%2F41-threads-teardown.t;h=3bbed52c43c83a8558b1057bf4520fddc042b0f3;hp=d8a6fc92b916ae1ada2fde01d2112b69125fc9e4;hb=7f2abe70c4334df1462a163d36bd809dd21d915e;hpb=d237f88f7fb8be8d6836157872d5bf2b9ba02beb

diff --git a/t/41-threads-teardown.t b/t/41-threads-teardown.t
index d8a6fc9..3bbed52 100644
--- a/t/41-threads-teardown.t
+++ b/t/41-threads-teardown.t
@@ -3,14 +3,20 @@
 use strict;
 use warnings;
 
+sub skipall {
+ my ($msg) = @_;
+ require Test::More;
+ Test::More::plan(skip_all => $msg);
+}
+
 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');
- }
+ my $force = $ENV{PERL_INDIRECT_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 threads;
@@ -20,18 +26,18 @@ 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';
- }
+ skipall 'This indirect isn\'t thread safe' unless indirect::I_THREADSAFE();
+ plan tests => 1;
+ defined and diag "Using threads $_" for $threads::VERSION;
 }
 
 sub run_perl {
  my $code = shift;
 
+ my $SystemRoot   = $ENV{SystemRoot};
  local %ENV;
+ $ENV{SystemRoot} = $SystemRoot if $^O eq 'MSWin32' and defined $SystemRoot;
+
  system { $^X } $^X, '-T', map("-I$_", @INC), '-e', $code;
 }