Only use Capture::Tiny when it is working on a simple example

[perl/modules/Variable-Magic.git] / t / 30-scalar.t

diff --git a/t/30-scalar.t b/t/30-scalar.t
index a3eb18a41fdc3eef305503aa4e751b0b2ac647c2..f6faea4ea1eaf27f79b839ec542f4b4f18a2e7eb 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';
@@ -104,8 +106,6 @@ SKIP: {
 
  unless (MGf_COPY) {
   $SKIP = 'No copy magic for this perl';
- } elsif ($Config{useithreads} and $] le 5.008003) {
-  $SKIP = 'Causes havoc during global destruction for old threaded perls';
  } else {
   eval "use Tie::Array";
   $SKIP = 'Tie::Array required to test clear magic on tied array values' if $@;