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

diff --git a/t/41-threads-teardown.t b/t/41-threads-teardown.t
index 6794151..8003fad 100644
--- a/t/41-threads-teardown.t
+++ b/t/41-threads-teardown.t
@@ -3,17 +3,14 @@
 use strict;
 use warnings;
 
-BEGIN { require indirect; }
-
 use lib 't/lib';
 use VPIT::TestHelpers (
- threads => [ 'indirect' => indirect::I_THREADSAFE ],
+ threads => [ 'indirect' => 'indirect::I_THREADSAFE()' ],
+ 'run_perl',
 );
 
 use Test::Leaner tests => 3;
 
-my $run_perl_failed = 'Could not execute perl subprocess';
-
 SKIP: {
  skip 'Fails on 5.8.2 and lower' => 1 if "$]" <= 5.008_002;
 
@@ -33,7 +30,7 @@ SKIP: {
   eval q{return; no indirect hook => \&cb; new Z;};
   exit $code;
  RUN
- skip $run_perl_failed => 1 unless defined $status;
+ skip RUN_PERL_FAILED() => 1 unless defined $status;
  is $status, 0,
         'loading the pragma in a thread and using it outside doesn\'t segfault';
 }
@@ -42,15 +39,15 @@ SKIP: {
  my $status = run_perl <<' RUN';
   use threads;
   BEGIN { require indirect; }
-  sub X::DESTROY { eval 'no indirect; 1'; exit 1 if $@ }
+  sub X2::DESTROY { eval 'no indirect; 1'; exit 1 if $@ }
   threads->create(sub {
-   my $x = bless { }, 'X';
+   my $x = bless { }, 'X2';
    $x->{self} = $x;
    return;
   })->join;
   exit $code;
  RUN
- skip $run_perl_failed => 1 unless defined $status;
+ 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';
 }
 
@@ -60,15 +57,16 @@ SKIP: {
   use threads::shared;
   my $code : shared;
   $code = 0;
-  no indirect cb => sub { lock $code; ++$code };
-  sub X::DESTROY { eval $_[0]->{code} }
+  no indirect hook => sub { lock $code; ++$code };
+  sub X3::DESTROY { eval $_[0]->{code} }
   threads->create(sub {
-   my $x = bless { code => 'new Z' }, 'X';
+   my $x = bless { code => 'new Z3' }, 'X3';
    $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';
+ 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';
 }