X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Findirect.git;a=blobdiff_plain;f=t%2F41-threads-teardown.t;h=42d4ae8e282151cbc4eb40db6c8fea8c24067b99;hp=8531afe1fe8d36a369435d828f3b9e762155b456;hb=1868a5983f5045def63a5cc7edf41454b407f66c;hpb=f23fcd5b540fd0b7a075ba6c71d7e6d3245a7dd5 diff --git a/t/41-threads-teardown.t b/t/41-threads-teardown.t index 8531afe..42d4ae8 100644 --- a/t/41-threads-teardown.t +++ b/t/41-threads-teardown.t @@ -3,33 +3,10 @@ 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 indirect::TestThreads; -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 => 1; sub run_perl { my $code = shift; @@ -43,7 +20,7 @@ sub run_perl { SKIP: { - skip 'Fails on 5.8.2 and lower' => 1 if $] <= 5.008002; + skip 'Fails on 5.8.2 and lower' => 1 if "$]" <= 5.008002; my $status = run_perl <<' RUN'; my ($code, @expected);