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 0293c645016b41a3124c047753b83063afc47cea..aed437a41e5b6b00e372835e217cc1c3fb7722ac 100644 (file)
--- a/t/18-opinfo.t
+++ b/t/18-opinfo.t
@@ -50,10 +50,13 @@ my @tests = (
 
 our $done;
 
 
 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 (@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
   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";
     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";
      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 {
      isa_ok $op, $exp->[1], $desc;
      is $op->name, $exp->[0], "$desc gets the right op info";
     } else {