MGf_COPY and MGf_DUP should always be set for the perls we consider

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

diff --git a/t/30-scalar.t b/t/30-scalar.t
index 71fa3cbcd8c0a222082d9985fecff1d928a015fc..dfd88bd91e3b1e5b3a12c26cb02f45b31bdced4e 100644 (file)
--- a/t/30-scalar.t
+++ b/t/30-scalar.t
@@ -7,12 +7,12 @@ use Config qw<%Config>;
 
 use Test::More tests => (2 * 14 + 2) + 2 * (2 * 8 + 4) + 3 + 1;
 
-use Variable::Magic qw<wizard cast dispell MGf_COPY>;
+use Variable::Magic qw<wizard cast dispell>;
 
 use lib 't/lib';
 use Variable::Magic::TestWatcher;
 
-my $is_5130_release = ($] == 5.013 && !$Config{git_describe}) ? 1 : 0;
+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> ],
@@ -72,7 +72,8 @@ $b = watch { exists $a[1] } { }, 'array element: exists';
 is $b, 1, 'scalar: array element: exists correctly';
 
 # $b has to be set inside the block for the test to pass on 5.8.3 and lower
-watch { $b = delete $a[1] } { get => 1, free => ($] > 5.008005 ? 1 : 0) }, 'array element: delete';
+watch { $b = delete $a[1] } { get => 1, free => ("$]" > 5.008005 ? 1 : 0) },
+                            'array element: delete';
 is $b, 6, 'scalar: array element: delete correctly';
 
 watch { $a[1] = 4 } { }, 'array element: set after delete';
@@ -102,16 +103,9 @@ is $b, 6, 'scalar: hash element: delete correctly';
 watch { $h{b} = 4 } { }, 'hash element: set after delete';
 
 SKIP: {
- my $SKIP;
-
- unless (MGf_COPY) {
-  $SKIP = 'No copy magic for this perl';
- } else {
-  eval "use Tie::Array";
-  $SKIP = 'Tie::Array required to test clear magic on tied array values' if $@;
+ unless (do { local $@; eval { require Tie::Array; 1 } }) {
+  skip 'Tie::Array required to test clear magic on tied array values' => 3;
  }
-
- skip $SKIP => 3 if $SKIP;
  defined and diag "Using Tie::Array $_" for $Tie::Array::VERSION;
 
  tie my @a, 'Tie::StdArray';