Fix tests for perl 5.13

diff --git a/t/18-opinfo.t b/t/18-opinfo.t
index a67021e47286fbf1ae7b9ebb42f00b771b755420..c9398cc38799e4946259ca330b101e9da9cb4a63 100644 (file)
--- a/t/18-opinfo.t
+++ b/t/18-opinfo.t
@@ -11,8 +11,12 @@ use Variable::Magic qw/wizard cast dispell VMG_OP_INFO_NAME VMG_OP_INFO_OBJECT/;
 
 sub Variable::Magic::TestPkg::foo { }
 
-my $aelem     = $] <= 5.008003 ? 'aelem' : $] < 5.013 ? 'aelemfast' : 'sassign';
-my $aelemf    = $] < 5.013 ? 'aelemfast' : 'sassign';
+my $is_5130_release = ($] == 5.013 && !$Config{git_describe}) ? 1 : 0;
+
+my $aelem     = $] <= 5.008003 ? 'aelem'
+                               : ($] < 5.013 or $is_5130_release) ? 'aelemfast'
+                                                                  : 'sassign';
+my $aelemf    = ($] < 5.013 or $is_5130_release) ? 'aelemfast' : 'sassign';
 my $aelemf_op = $aelemf eq 'sassign'
                    ? 'B::BINOP' : $Config{useithreads} ? 'B::PADOP' : 'B::SVOP';
 

diff --git a/t/30-scalar.t b/t/30-scalar.t
index a3eb18a41fdc3eef305503aa4e751b0b2ac647c2..839cf58ac641f415612ab1e8cd6b857c0073101c 100644 (file)
--- a/t/30-scalar.t
+++ b/t/30-scalar.t
@@ -12,6 +12,8 @@ use Variable::Magic qw/wizard cast dispell MGf_COPY/;
 use lib 't/lib';
 use Variable::Magic::TestWatcher;
 
+my $is_5130_release = ($] == 5.013 && !$Config{git_describe}) ? 1 : 0;
+
 my $wiz = init_watcher
         [ qw/get set len clear free copy dup local fetch store exists delete/ ],
         'scalar';
@@ -58,7 +60,7 @@ watch { cast $a[1], $wiz } { }, 'array element: cast';
 
 watch { $a[1] = 6; () } { set => 1 }, 'array element: set';
 
-$b = watch { $a[1] } { get => 1 }, 'array element: get';
+$b = watch { $a[1] } { get => ($is_5130_release ? 2 : 1) },'array element: get';
 is $b, 6, 'scalar: array element: get correctly';
 
 watch { $a[0] = 5 } { }, 'array element: set other';
@@ -83,7 +85,7 @@ watch { cast $h{b}, $wiz } { }, 'hash element: cast';
 
 watch { $h{b} = 6; () } { set => 1 }, 'hash element: set';
 
-$b = watch { $h{b} } { get => 1 }, 'hash element: get';
+$b = watch { $h{b} } { get => ($is_5130_release ? 2 : 1) }, 'hash element: get';
 is $b, 6, 'scalar: hash element: get correctly';
 
 watch { $h{a} = 5 } { }, 'hash element: set other';