X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2FVariable-Magic.git;a=blobdiff_plain;f=t%2F16-huf.t;h=024a39c9bb32ad90c71d2e6d571213b3cb8c01e0;hp=32f767770749e8bd8fe41f33397652d8ffff6c77;hb=93df7812b9a0da8cdfa57a107eb2f8f4b4744b49;hpb=3bc98bdbdb230943e7fb3135e325f10013acac2d

diff --git a/t/16-huf.t b/t/16-huf.t
index 32f7677..024a39c 100644
--- a/t/16-huf.t
+++ b/t/16-huf.t
@@ -5,22 +5,18 @@ use warnings;
 
 use Test::More;
 
-use Variable::Magic qw<wizard cast dispell VMG_UVAR>;
+use lib 't/lib';
+use VPIT::TestHelpers;
 
-if (!VMG_UVAR) {
- plan skip_all => 'No nice uvar magic for this perl';
-}
+use Variable::Magic qw<wizard cast dispell VMG_UVAR>;
 
-eval "use Hash::Util::FieldHash";
-if ($@) {
- plan skip_all => 'Hash::Util::FieldHash required for testing uvar interaction';
-} else {
+if (VMG_UVAR) {
+ load_or_skip_all('Hash::Util::FieldHash', undef, [ ]);
  plan tests => 2 * 5 + 7 + 1;
- defined and diag "Using Hash::Util::FieldHash $_"
-                                            for $Hash::Util::FieldHash::VERSION;
+} else {
+ skip_all 'No nice uvar magic for this perl';
 }
 
-use lib 't/lib';
 use Variable::Magic::TestWatcher;
 
 my $wiz = init_watcher [ qw<fetch store> ], 'huf';