X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Findirect.git;a=blobdiff_plain;f=t%2F41-threads-teardown.t;h=42d4ae8e282151cbc4eb40db6c8fea8c24067b99;hp=b2186e8ee64b216ad231ec01e1e59deae1adcd4b;hb=1868a5983f5045def63a5cc7edf41454b407f66c;hpb=ca6c9d6f907915ef07a55bd86e0b1333cc8ac649 diff --git a/t/41-threads-teardown.t b/t/41-threads-teardown.t index b2186e8..42d4ae8 100644 --- a/t/41-threads-teardown.t +++ b/t/41-threads-teardown.t @@ -3,30 +3,10 @@ use strict; use warnings; -use Config qw/%Config/; - -BEGIN { - if (!$Config{useithreads}) { - require Test::More; - Test::More->import; - plan(skip_all => 'This perl wasn\'t built to support threads'); - } -} - -use threads; +use lib 't/lib'; +use indirect::TestThreads; -use Test::More; - -BEGIN { - delete $ENV{PERL_INDIRECT_PM_DISABLE}; - require indirect; - if (indirect::I_THREADSAFE()) { - plan tests => 1; - defined and diag "Using threads $_" for $threads::VERSION; - } else { - plan skip_all => 'This indirect isn\'t thread safe'; - } -} +use Test::Leaner tests => 1; sub run_perl { my $code = shift; @@ -40,13 +20,13 @@ 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); BEGIN { $code = 2; - @expected = qw/X Z/; + @expected = qw; } sub cb { --$code if $_[0] eq shift(@expected) || q{DUMMY} } use threads;