X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F40-threads.t;h=6e77c2fd24b27d5285c59265ec1b0f1b4daaa20d;hb=be3665d8224dfbb9cff5f53796500821d9c8185a;hp=f67dfc313bf182f6f46229684a667c0f956011dd;hpb=b30ad18085c2c1d922eff05ee4801c38ad465807;p=perl%2Fmodules%2FVariable-Magic.git diff --git a/t/40-threads.t b/t/40-threads.t index f67dfc3..6e77c2f 100644 --- a/t/40-threads.t +++ b/t/40-threads.t @@ -1,94 +1,105 @@ -#!perl -T +#!perl 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_VARIABLE_MAGIC_TEST_THREADS} ? 1 : !1; - my $t_v = $force ? '0' : '1.67'; - my $ts_v = $force ? '0' : '1.14'; - 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; - skipall "threads $t_v required to test thread safety" - unless eval "use threads $t_v; 1"; - skipall "threads::shared $ts_v required to test thread safety" - unless eval "use threads::shared $ts_v; 1"; -} - -use Test::More; # after threads - use Variable::Magic qw< wizard cast dispell getdata - VMG_THREADSAFE VMG_OP_INFO_NAME VMG_OP_INFO_OBJECT + VMG_OP_INFO_NAME VMG_OP_INFO_OBJECT >; -BEGIN { - skipall 'This Variable::Magic isn\'t thread safe' unless VMG_THREADSAFE; - plan tests => (4 * 18 + 1) + (4 * 13 + 1); - defined and diag "Using threads $_" for $threads::VERSION; - defined and diag "Using threads::shared $_" for $threads::shared::VERSION; -} +use lib 't/lib'; +use VPIT::TestHelpers ( + threads => [ 'Variable::Magic' => 'Variable::Magic::VMG_THREADSAFE()' ], +); + +use Test::Leaner 'no_plan'; my $destroyed : shared = 0; sub try { my ($dispell, $op_info) = @_; - my $tid = threads->tid(); - my $c = 0; - my $wiz = eval { - wizard data => sub { $_[1] + $tid }, - get => sub { ++$c; 0 }, - set => sub { - my $op = $_[-1]; - if ($op_info == VMG_OP_INFO_OBJECT) { - is_deeply { class => ref($op), name => $op->name }, - { class => 'B::BINOP', name => 'sassign' }, - "op object in thread $tid is correct"; - } else { - is $op, 'sassign', "op name in thread $tid is correct"; - } - 0 - }, - free => sub { lock $destroyed; ++$destroyed; 0 }, - op_info => $op_info - }; - is($@, '', "wizard in thread $tid doesn't croak"); - isnt($wiz, undef, "wizard in thread $tid is defined"); - is($c, 0, "wizard in thread $tid doesn't trigger magic"); + my $tid = threads->tid; + + my $c = 0; + my $wiz; + + { + local $@; + $wiz = eval { + wizard( + data => sub { $_[1] + $tid }, + get => sub { ++$c; 0 }, + set => sub { + my $op = $_[-1]; + + if ($op_info == VMG_OP_INFO_OBJECT) { + is_deeply { class => ref($op), name => $op->name }, + { class => 'B::BINOP', name => 'sassign' }, + "op object in thread $tid is correct"; + } else { + is $op, 'sassign', "op name in thread $tid is correct"; + } + + return 0; + }, + free => sub { lock $destroyed; ++$destroyed; 0 }, + op_info => $op_info, + ); + }; + is $@, '', "wizard in thread $tid doesn't croak"; + isnt $wiz, undef, "wizard in thread $tid is defined"; + is $c, 0, "wizard in thread $tid doesn't trigger magic"; + } + my $a = 3; - my $res = eval { cast $a, $wiz, sub { 5 }->() }; - is($@, '', "cast in thread $tid doesn't croak"); - is($c, 0, "cast in thread $tid doesn't trigger magic"); - my $b; - eval { $b = $a }; - is($@, '', "get in thread $tid doesn't croak"); - is($b, 3, "get in thread $tid returns the right thing"); - is($c, 1, "get in thread $tid triggers magic"); - my $d = eval { getdata $a, $wiz }; - is($@, '', "getdata in thread $tid doesn't croak"); - is($d, 5 + $tid, "getdata in thread $tid returns the right thing"); - is($c, 1, "getdata in thread $tid doesn't trigger magic"); - eval { $a = 9 }; - is($@, '', "set in thread $tid (check opname) doesn't croak"); - if ($dispell) { - $res = eval { dispell $a, $wiz }; - is($@, '', "dispell in thread $tid doesn't croak"); - is($c, 1, "dispell in thread $tid doesn't trigger magic"); - undef $b; + + { + local $@; + my $res = eval { cast $a, $wiz, sub { 5 }->() }; + is $@, '', "cast in thread $tid doesn't croak"; + is $c, 0, "cast in thread $tid doesn't trigger magic"; + } + + { + local $@; + my $b; eval { $b = $a }; - is($@, '', "get in thread $tid after dispell doesn't croak"); - is($b, 9, "get in thread $tid after dispell returns the right thing"); - is($c, 1, "get in thread $tid after dispell doesn't trigger magic"); + is $@, '', "get in thread $tid doesn't croak"; + is $b, 3, "get in thread $tid returns the right thing"; + is $c, 1, "get in thread $tid triggers magic"; + } + + { + local $@; + my $d = eval { getdata $a, $wiz }; + is $@, '', "getdata in thread $tid doesn't croak"; + is $d, 5 + $tid, "getdata in thread $tid returns the right thing"; + is $c, 1, "getdata in thread $tid doesn't trigger magic"; + } + + { + local $@; + eval { $a = 9 }; + is $@, '', "set in thread $tid (check opname) doesn't croak"; + } + + if ($dispell) { + { + local $@; + my $res = eval { dispell $a, $wiz }; + is $@, '', "dispell in thread $tid doesn't croak"; + is $c, 1, "dispell in thread $tid doesn't trigger magic"; + } + + { + local $@; + my $b; + eval { $b = $a }; + is $@, '', "get in thread $tid after dispell doesn't croak"; + is $b, 9, "get in thread $tid after dispell returns the right thing"; + is $c, 1, "get in thread $tid after dispell doesn't trigger magic"; + } } return; # Ugly if not here } @@ -99,9 +110,9 @@ for my $dispell (1, 0) { $destroyed = 0; } - my @t = map { threads->create(\&try, $dispell, $_) } + my @threads = map spawn(\&try, $dispell, $_), (VMG_OP_INFO_NAME) x 2, (VMG_OP_INFO_OBJECT) x 2; - $_->join for @t; + $_->join for @threads; { lock $destroyed;