X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F34-glob.t;h=af77a4fb795470a6c06fde61654315ebd6a8cd92;hb=93df7812b9a0da8cdfa57a107eb2f8f4b4744b49;hp=74183c9c5cbb8ea09124a6bf20b990caac23a7a0;hpb=3bc98bdbdb230943e7fb3135e325f10013acac2d;p=perl%2Fmodules%2FVariable-Magic.git

diff --git a/t/34-glob.t b/t/34-glob.t
index 74183c9..af77a4f 100644
--- a/t/34-glob.t
+++ b/t/34-glob.t
@@ -5,14 +5,12 @@ use warnings;
 
 use Test::More;
 
+use lib 't/lib';
+use VPIT::TestHelpers;
+
 BEGIN {
- local $@;
- if (eval "use Symbol qw<gensym>; 1") {
-  plan tests => 2 * 12 + 1;
-  defined and diag "Using Symbol $_" for $Symbol::VERSION;
- } else {
-  plan skip_all => "Symbol::gensym required for testing magic for globs";
- }
+ load_or_skip_all('Symbol', undef, [ 'gensym' ]);
+ plan tests => 2 * 17 + 1;
 }
 
 use Variable::Magic qw<cast dispell VMG_COMPAT_GLOB_GET>;
@@ -32,19 +30,38 @@ watch { cast *a, $wiz } +{ }, 'cast';
 
 watch { local *b = *a } +{ %get }, 'assign to';
 
-watch { *a = \1 }          +{ %get, set => 1 }, 'assign scalar slot';
-watch { *a = [ qw<x y> ] } +{ %get, set => 1 }, 'assign array slot';
-watch { *a = { u => 1 } }  +{ %get, set => 1 }, 'assign hash slot';
-watch { *a = sub { } }     +{ %get, set => 1 }, 'assign code slot';
+SKIP: {
+ skip 'This failed temporarily between perls 5.13.1 and 5.13.8 (included)'
+                            => 5 * 2 if "$]" >= 5.013_001 and "$]" <= 5.013_008;
 
-watch { *a = gensym() }    +{ %get, set => 1 }, 'assign glob';
+ my $cxt = 'void contex';
+ my $exp = { set => 1 };
+
+ watch { *a = \1 }          $exp, "assign scalar slot in $cxt";
+ watch { *a = [ qw<x y> ] } $exp, "assign array slot in $cxt";
+ watch { *a = { u => 1 } }  $exp, "assign hash slot in $cxt";
+ watch { *a = sub { } }     $exp, "assign code slot in $cxt";
+ watch { *a = gensym() }    $exp, "assign glob in $cxt";
+}
+
+{
+ my $cxt = 'scalar context';
+ my $exp = { %get, set => 1 };
+ my $v;
+
+ $v = watch { *a = \1 }          $exp, "assign scalar slot in $cxt";
+ $v = watch { *a = [ qw<x y> ] } $exp, "assign array slot in $cxt";
+ $v = watch { *a = { u => 1 } }  $exp, "assign hash slot in $cxt";
+ $v = watch { *a = sub { } }     $exp, "assign code slot in $cxt";
+ $v = watch { *a = gensym() }    $exp, "assign glob in $cxt";
+}
 
 watch {
  local *b = gensym();
  watch { cast *b, $wiz } +{ }, 'cast 2';
 } +{ }, 'scope end';
 
-%get = () if $] >= 5.013007;
+%get = () if "$]" >= 5.013_007;
 
 watch { undef *a } +{ %get }, 'undef';