From: Vincent Pit Date: Mon, 20 Jul 2015 18:03:32 +0000 (-0300) Subject: Avoid global lookups in the magic callbacks in t/18-opinfo.t X-Git-Tag: v0.58~7 X-Git-Url: http://git.vpit.fr/?a=commitdiff_plain;h=47305776af757964b20c9739d4d44ad35a3dfb90;p=perl%2Fmodules%2FVariable-Magic.git Avoid global lookups in the magic callbacks in t/18-opinfo.t This will hopefull work around a rare test failure on MSWin32 (see http://www.cpantesters.org/cpan/report/cbda218a-6c4a-1014-b9c5-a00a324d4f1e) --- diff --git a/t/18-opinfo.t b/t/18-opinfo.t index 0293c64..aed437a 100644 --- a/t/18-opinfo.t +++ b/t/18-opinfo.t @@ -50,10 +50,13 @@ my @tests = ( our $done; +my $OP_INFO_NAME = VMG_OP_INFO_NAME; +my $OP_INFO_OBJECT = VMG_OP_INFO_OBJECT; + for (@tests) { my ($key, $var, $init, $test, $exp) = @$_; - for my $op_info (VMG_OP_INFO_NAME, VMG_OP_INFO_OBJECT) { + for my $op_info ($OP_INFO_NAME, $OP_INFO_OBJECT) { my $wiz; # We must test for the $op correctness inside the callback because, if we @@ -64,9 +67,9 @@ for (@tests) { return if $done; my $op = $_[-1]; my $desc = "$key magic with op_info == $op_info"; - if ($op_info == VMG_OP_INFO_NAME) { + if ($op_info == $OP_INFO_NAME) { is $op, $exp->[0], "$desc gets the right op info"; - } elsif ($op_info == VMG_OP_INFO_OBJECT) { + } elsif ($op_info == $OP_INFO_OBJECT) { isa_ok $op, $exp->[1], $desc; is $op->name, $exp->[0], "$desc gets the right op info"; } else {