Revamp module setup/teardown

[perl/modules/Lexical-Types.git] / t / 81-threads-teardown.t

diff --git a/t/81-threads-teardown.t b/t/81-threads-teardown.t
index 7a5c2270268a3df0b335a154fc532d4b3a872bb9..6fc843780f6281ab2792a76ce762c0dd2386f4f5 100644 (file)
--- a/t/81-threads-teardown.t
+++ b/t/81-threads-teardown.t
@@ -4,12 +4,14 @@ use strict;
 use warnings;
 
 use lib 't/lib';
-use VPIT::TestHelpers;
-use Lexical::Types::TestThreads;
+use VPIT::TestHelpers (
+ threads => [ 'Lexical::Types' => 'Lexical::Types::LT_THREADSAFE()' ],
+ 'run_perl',
+);
 
-use Test::More tests => 2;
+use Test::Leaner tests => 2;
 
-{
+SKIP: {
  my $status = run_perl <<' RUN';
   { package IntX; package IntY; package IntZ; }
   my ($code, @expected);
@@ -30,16 +32,18 @@ use Test::More tests => 2;
   $code += 256 if $code < 0;
   exit $code;
  RUN
+ 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 Lexical::Types; }
   sub X::DESTROY {
-   eval 'use Lexical::Types; package Z; my Z $z = 1';
+   my $res = eval 'use Lexical::Types; sub Z::TYPEDSCALAR { 123 } my Z $z';
    exit 1 if $@;
+   exit 2 if not defined $res or $res != 123;
   }
   threads->create(sub {
    my $x = bless { }, 'X';
@@ -48,5 +52,6 @@ use Test::More tests => 2;
   })->join;
   exit 0;
  RUN
+ skip RUN_PERL_FAILED() => 1 unless defined $status;
  is $status, 0, 'Lexical::Types can be loaded in eval STRING during global destruction at the end of a thread';
 }