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

diff --git a/t/41-threads-teardown.t b/t/41-threads-teardown.t
index d8a6fc9..8003fad 100644
--- a/t/41-threads-teardown.t
+++ b/t/41-threads-teardown.t
@@ -3,47 +3,22 @@
 use strict;
 use warnings;
 
-use Config qw/%Config/;
+use lib 't/lib';
+use VPIT::TestHelpers (
+ threads => [ 'indirect' => 'indirect::I_THREADSAFE()' ],
+ 'run_perl',
+);
 
-BEGIN {
- if (!$Config{useithreads}) {
-  require Test::More;
-  Test::More->import;
-  plan(skip_all => 'This perl wasn\'t built to support threads');
- }
-}
-
-use threads;
-
-use Test::More;
+use Test::Leaner tests => 3;
 
-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';
- }
-}
-
-sub run_perl {
- my $code = shift;
-
- local %ENV;
- system { $^X } $^X, '-T', map("-I$_", @INC), '-e', $code;
-}
-
-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);
   BEGIN {
    $code = 2;
-   @expected = qw/X Z/;
+   @expected = qw<X Z>;
   }
   sub cb { --$code if $_[0] eq shift(@expected) || q{DUMMY} }
   use threads;
@@ -55,5 +30,43 @@ 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 X2::DESTROY { eval 'no indirect; 1'; exit 1 if $@ }
+  threads->create(sub {
+   my $x = bless { }, 'X2';
+   $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 hook => sub { lock $code; ++$code };
+  sub X3::DESTROY { eval $_[0]->{code} }
+  threads->create(sub {
+   my $x = bless { code => 'new Z3' }, 'X3';
+   $x->{self} = $x;
+   return;
+  })->join;
+  exit $code;
+ RUN
+ skip RUN_PERL_FAILED() => 1 unless defined $status;
+ my $code = $status >> 8;
+ is $code, 1, 'indirect checks eval STRING during global destruction at the end of a cloned thread';
 }