X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F51-threads-teardown.t;h=4ff53452e15023ebd1e94bf8a9b14b06b4463deb;hb=e2cf50a4ad234e0ab9844ac0cb45f2a363abe217;hp=a688df8e8a92d3a1fc42278755438da9d96eaa85;hpb=bff16fe7ea455b013bb0e681f2852f6c11d72636;p=perl%2Fmodules%2Fautovivification.git

diff --git a/t/51-threads-teardown.t b/t/51-threads-teardown.t
index a688df8..4ff5345 100644
--- a/t/51-threads-teardown.t
+++ b/t/51-threads-teardown.t
@@ -4,23 +4,16 @@ use strict;
 use warnings;
 
 use lib 't/lib';
-use autovivification::TestThreads;
+use VPIT::TestHelpers (
+ threads => [ 'autovivification' => 'autovivification::A_THREADSAFE()' ],
+ 'run_perl',
+);
 
-use Test::Leaner tests => 1;
-
-sub run_perl {
- my $code = shift;
-
- my $SystemRoot   = $ENV{SystemRoot};
- local %ENV;
- $ENV{SystemRoot} = $SystemRoot if $^O eq 'MSWin32' and defined $SystemRoot;
-
- system { $^X } $^X, '-T', map("-I$_", @INC), '-e', $code;
-}
+use Test::Leaner tests => 2;
 
 SKIP:
 {
- skip 'Fails on 5.8.2 and lower' => 1 if "$]" <= 5.008002;
+ skip 'Fails on 5.8.2 and lower' => 1 if "$]" <= 5.008_002;
 
  my $status = run_perl <<' RUN';
   my $code = 1 + 2 + 4;
@@ -34,5 +27,26 @@ SKIP:
            ? 0 : 4;
   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 autovivification; }
+  sub X::DESTROY {
+   eval 'no autovivification; my $x; my $y = $x->{foo}{bar}; use autovivification; my $z = $x->{a}{b}{c};';
+   exit 1 if $@;
+  }
+  threads->create(sub {
+   my $x = bless { }, 'X';
+   $x->{self} = $x;
+   return;
+  })->join;
+  exit $code;
+ RUN
+ skip RUN_PERL_FAILED() => 1 unless defined $status;
+ is $status, 0, 'autovivification can be loaded in eval STRING during global destruction at the end of a thread';
 }