X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Fautovivification.git;a=blobdiff_plain;f=t%2F50-threads.t;h=e8e7cfe3d6a057a4e5da5ea497faf417b4ad436d;hp=9c095457ff229fc6e2ac09bba95bcd673913145d;hb=bff16fe7ea455b013bb0e681f2852f6c11d72636;hpb=e1d2632ef0b4e3ee3e418c12903f81b5d7b55b1a diff --git a/t/50-threads.t b/t/50-threads.t index 9c09545..e8e7cfe 100644 --- a/t/50-threads.t +++ b/t/50-threads.t @@ -3,42 +3,13 @@ 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_AUTOVIVIFICATION_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 autovivification::TestThreads; -use threads; +use Test::Leaner; -use Test::More; - -BEGIN { - require autovivification; - skipall 'This autovivification isn\'t thread safe' - unless autovivification::A_THREADSAFE(); -} - -my ($threads, $runs); -BEGIN { - $threads = 10; - $runs = 2; -} - -BEGIN { - plan tests => $threads * $runs * 3 * (1 + 2); - defined and diag "Using threads $_" for $threads::VERSION; -} +my $threads = 10; +my $runs = 2; { no autovivification; @@ -90,5 +61,10 @@ SKIP: } } -my @t = map threads->create(\&try), 1 .. $threads; -$_->join for @t; +my @threads = map spawn(\&try), 1 .. $threads; + +$_->join for @threads; + +pass 'done'; + +done_testing(scalar(@threads) * $runs * 3 * (1 + 2) + 1);