use strict;
use warnings;
-sub skipall {
- my ($msg) = @_;
- require Test::More;
- Test::More::plan(skip_all => $msg);
-}
-
-use Config qw<%Config>;
-
-BEGIN {
- my $force = $ENV{PERL_INDIRECT_TEST_THREADS} ? 1 : !1;
- skipall 'This perl wasn\'t built to support threads'
- unless $Config{useithreads};
- skipall 'perl 5.13.4 required to test thread safety'
- unless $force or "$]" >= 5.013004;
-}
+use lib 't/lib';
+use VPIT::TestHelpers (
+ threads => [ 'indirect' => 'indirect::I_THREADSAFE()' ],
+ 'run_perl',
+);
-use threads;
-
-use Test::More;
-
-BEGIN {
- delete $ENV{PERL_INDIRECT_PM_DISABLE};
- require indirect;
- skipall 'This indirect isn\'t thread safe' unless indirect::I_THREADSAFE();
- plan tests => 1;
- defined and diag "Using threads $_" for $threads::VERSION;
-}
+use Test::Leaner tests => 3;
-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;
-}
-
-SKIP:
-{
- skip 'Fails on 5.8.2 and lower' => 1 if "$]" <= 5.008002;
+SKIP: {
+ skip 'Fails on 5.8.2 and lower' => 1 if "$]" <= 5.008_002;
my $status = run_perl <<' RUN';
my ($code, @expected);
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; }
+ sub X2::DESTROY { eval 'no indirect; 1'; exit 1 if $@ }
+ threads->create(sub {
+ my $x = bless { }, 'X2';
+ $x->{self} = $x;
+ return;
+ })->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;
+ my $code : shared;
+ $code = 0;
+ no indirect hook => sub { lock $code; ++$code };
+ sub X3::DESTROY { eval $_[0]->{code} }
+ threads->create(sub {
+ my $x = bless { code => 'new Z3' }, 'X3';
+ $x->{self} = $x;
+ return;
+ })->join;
+ exit $code;
+ RUN
+ 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';
}