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

diff --git a/t/41-threads-teardown.t b/t/41-threads-teardown.t
index 419ce9d..6794151 100644
--- a/t/41-threads-teardown.t
+++ b/t/41-threads-teardown.t
@@ -3,14 +3,18 @@
 use strict;
 use warnings;
 
+BEGIN { require indirect; }
+
 use lib 't/lib';
-use VPIT::TestHelpers;
-use indirect::TestThreads;
+use VPIT::TestHelpers (
+ threads => [ 'indirect' => indirect::I_THREADSAFE ],
+);
+
+use Test::Leaner tests => 3;
 
-use Test::Leaner tests => 1;
+my $run_perl_failed = 'Could not execute perl subprocess';
 
-SKIP:
-{
+SKIP: {
  skip 'Fails on 5.8.2 and lower' => 1 if "$]" <= 5.008_002;
 
  my $status = run_perl <<' RUN';
@@ -29,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';
 }