Rename I_CHECK_MUTEX_* to I_CHECK_*

[perl/modules/indirect.git] / t / 41-threads-teardown.t

diff --git a/t/41-threads-teardown.t b/t/41-threads-teardown.t
index 6c4814c0057da6a6987f3c16c2ff34c3f1ca4c8f..6794151a9153b904d2ef83eef5ac5725e660ffdc 100644 (file)
--- 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;
 
-SKIP:
-{
+my $run_perl_failed = 'Could not execute perl subprocess';
+
+SKIP: {
  skip 'Fails on 5.8.2 and lower' => 1 if "$]" <= 5.008_002;
 
  my $status = run_perl <<' RUN';
@@ -29,10 +33,12 @@ 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; }
@@ -44,10 +50,11 @@ SKIP:
   })->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;
@@ -62,5 +69,6 @@ SKIP:
   })->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';
 }