X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Findirect.git;a=blobdiff_plain;f=t%2F41-threads-teardown.t;h=a4a005f6370a62bf9791dcf5bb2ed5ab131f34d9;hp=64c23dc249d4f6b2a09aeacf96ed3298a62d8022;hb=922f734434b9a4bacae95a124dcb9724a4d64259;hpb=76861cbb848c770203b09f413c9c65ca58c808c8

diff --git a/t/41-threads-teardown.t b/t/41-threads-teardown.t
index 64c23dc..a4a005f 100644
--- a/t/41-threads-teardown.t
+++ b/t/41-threads-teardown.t
@@ -3,21 +3,14 @@
 use strict;
 use warnings;
 
-use lib 't/lib';
-use indirect::TestThreads;
-
-use Test::Leaner tests => 1;
-
-sub run_perl {
- my $code = shift;
+BEGIN { require indirect; }
 
- 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;
+use lib 't/lib';
+use VPIT::TestHelpers (
+ threads => [ 'indirect' => indirect::I_THREADSAFE ],
+);
 
- system { $^X } $^X, '-T', map("-I$_", @INC), '-e', $code;
-}
+use Test::Leaner tests => 3;
 
 SKIP:
 {
@@ -41,3 +34,36 @@ SKIP:
  RUN
  is $status, 0, 'loading the pragma in a thread and using it outside doesn\'t segfault';
 }
+
+{
+ 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
+ is $status, 0, 'indirect can be loaded in eval STRING during global destruction at the end of a thread';
+}
+
+{
+ 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
+ is $status, 0, 'indirect does not check eval STRING during global destruction at the end of a thread';
+}