X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Findirect.git;a=blobdiff_plain;f=t%2F41-threads-teardown.t;h=6794151a9153b904d2ef83eef5ac5725e660ffdc;hp=8531afe1fe8d36a369435d828f3b9e762155b456;hb=b58bc186ae53367c8df3b55e162f101c8e102a8d;hpb=f23fcd5b540fd0b7a075ba6c71d7e6d3245a7dd5

diff --git a/t/41-threads-teardown.t b/t/41-threads-teardown.t
index 8531afe..6794151 100644
--- a/t/41-threads-teardown.t
+++ b/t/41-threads-teardown.t
@@ -3,47 +3,19 @@
 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_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;
-
-use Test::More;
+BEGIN { require indirect; }
 
-BEGIN {
- delete $ENV{PERL_INDIRECT_PM_DISABLE};
- require indirect;
- 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;
+use lib 't/lib';
+use VPIT::TestHelpers (
+ threads => [ 'indirect' => indirect::I_THREADSAFE ],
+);
 
- my $SystemRoot   = $ENV{SystemRoot};
- local %ENV;
- $ENV{SystemRoot} = $SystemRoot if $^O eq 'MSWin32' and defined $SystemRoot;
+use Test::Leaner tests => 3;
 
- system { $^X } $^X, '-T', map("-I$_", @INC), '-e', $code;
-}
+my $run_perl_failed = 'Could not execute perl subprocess';
 
-SKIP:
-{
- skip 'Fails on 5.8.2 and lower' => 1 if $] <= 5.008002;
+SKIP: {
+ skip 'Fails on 5.8.2 and lower' => 1 if "$]" <= 5.008_002;
 
  my $status = run_perl <<' RUN';
   my ($code, @expected);
@@ -61,5 +33,42 @@ SKIP:
   eval q{return; no indirect hook => \&cb; new Z;};
   exit $code;
  RUN
- is $status, 0, 'loading the pragma in a thread and using it outside doesn\'t segfault';
+ skip $run_perl_failed => 1 unless defined $status;
+ is $status, 0,
+        'loading the pragma in a thread and using it outside doesn\'t segfault';
+}
+
+SKIP: {
+ my $status = run_perl <<' RUN';
+  use threads;
+  BEGIN { require indirect; }
+  sub X::DESTROY { eval 'no indirect; 1'; exit 1 if $@ }
+  threads->create(sub {
+   my $x = bless { }, 'X';
+   $x->{self} = $x;
+   return;
+  })->join;
+  exit $code;
+ RUN
+ skip $run_perl_failed => 1 unless defined $status;
+ is $status, 0, 'indirect can be loaded in eval STRING during global destruction at the end of a thread';
+}
+
+SKIP: {
+ my $status = run_perl <<' RUN';
+  use threads;
+  use threads::shared;
+  my $code : shared;
+  $code = 0;
+  no indirect cb => sub { lock $code; ++$code };
+  sub X::DESTROY { eval $_[0]->{code} }
+  threads->create(sub {
+   my $x = bless { code => 'new Z' }, 'X';
+   $x->{self} = $x;
+   return;
+  })->join;
+  exit $code;
+ RUN
+ skip $run_perl_failed => 1 unless defined $status;
+ is $status, 0, 'indirect does not check eval STRING during global destruction at the end of a thread';
 }