From: Vincent Pit Date: Mon, 20 Jul 2015 18:47:42 +0000 (-0300) Subject: Work around stray exits in t/40-threads.t and t/41-clone.t X-Git-Tag: v0.58~5 X-Git-Url: http://git.vpit.fr/?a=commitdiff_plain;h=b1c264655ccc1eca4423e9dd9479855938bbac24;p=perl%2Fmodules%2FVariable-Magic.git Work around stray exits in t/40-threads.t and t/41-clone.t --- diff --git a/t/40-threads.t b/t/40-threads.t index 9b2d2fa..151116b 100644 --- a/t/40-threads.t +++ b/t/40-threads.t @@ -102,7 +102,8 @@ sub try { is $c, 1, "get in thread $tid after dispell doesn't trigger magic"; } } - return; # Ugly if not here + + return 1; } for my $dispell (1, 0) { @@ -111,11 +112,16 @@ for my $dispell (1, 0) { $destroyed = 0; } + my $completed = 0; + my @threads = map spawn(\&try, $dispell, $_), ('name') x 2, ('object') x 2; - $_->join for @threads; + for my $thr (@threads) { + my $res = $thr->join; + $completed += $res if defined $res; + } { lock $destroyed; - is $destroyed, (1 - $dispell) * 4, 'destructors'; + is $destroyed, (1 - $dispell) * $completed, 'destructors'; } } diff --git a/t/41-clone.t b/t/41-clone.t index 1efd250..2058cc5 100644 --- a/t/41-clone.t +++ b/t/41-clone.t @@ -102,7 +102,7 @@ sub try { } } - return; + return 1; } my $wiz_name = spawn_wiz VMG_OP_INFO_NAME; @@ -119,16 +119,21 @@ for my $dispell (1, 0) { $destroyed = 0; } + my $completed = 0; + my @threads = map spawn(\&try, $dispell, $wiz), 1 .. 2; - $_->join for @threads; + for my $thr (@threads) { + my $res = $thr->join; + $completed += $res if defined $res; + } { lock $c; - is $c, 2, "get triggered twice"; + is $c, $completed, "get triggered twice"; } { lock $destroyed; - is $destroyed, (1 - $dispell) * 2, 'destructors'; + is $destroyed, (1 - $dispell) * $completed, 'destructors'; } } }