Update VPIT::TestHelpers to 2a6ac0f1

[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..ecb26368bebb03b257eb3305d04378991c71d007 100644 (file)
--- a/t/41-threads-teardown.t
+++ b/t/41-threads-teardown.t
@@ -4,13 +4,14 @@ use strict;
 use warnings;
 
 use lib 't/lib';
-use VPIT::TestHelpers;
-use indirect::TestThreads;
+use VPIT::TestHelpers (
+ threads => [ 'indirect' => 'indirect::I_THREADSAFE()' ],
+ 'run_perl',
+);
 
 use Test::Leaner tests => 3;
 
-SKIP:
-{
+SKIP: {
  skip 'Fails on 5.8.2 and lower' => 1 if "$]" <= 5.008_002;
 
  my $status = run_perl <<' RUN';
@@ -29,10 +30,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 +47,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 +66,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';
 }