Tweak some optional module loading in tests

diff --git a/t/16-huf.t b/t/16-huf.t
index 32f767770749e8bd8fe41f33397652d8ffff6c77..af9e74022a62ef2513bc2731c114f18ccd364f49 100644 (file)
--- a/t/16-huf.t
+++ b/t/16-huf.t
@@ -11,13 +11,15 @@ if (!VMG_UVAR) {
  plan skip_all => 'No nice uvar magic for this perl';
 }
 
  plan skip_all => 'No nice uvar magic for this perl';
 }
 

-eval "use Hash::Util::FieldHash";
-if ($@) {
- plan skip_all => 'Hash::Util::FieldHash required for testing uvar interaction';
-} else {
- plan tests => 2 * 5 + 7 + 1;
- defined and diag "Using Hash::Util::FieldHash $_"
+{
+ local $@;
+ if (eval { require Hash::Util::FieldHash; 1 }) {
+  plan tests => 2 * 5 + 7 + 1;
+  defined and diag "Using Hash::Util::FieldHash $_"

                                             for $Hash::Util::FieldHash::VERSION;
                                             for $Hash::Util::FieldHash::VERSION;

+ } else {
+  plan skip_all => 'Hash::Util::FieldHash required for testing uvar interaction'
+ }

 }
 
 use lib 't/lib';
 }
 
 use lib 't/lib';

diff --git a/t/25-copy.t b/t/25-copy.t
index a18022f057488ca669b7375f790fe95387dc2bcd..7e13dfdf324fdd525986dbaba8b23456f23d9a1f 100644 (file)
--- a/t/25-copy.t
+++ b/t/25-copy.t
@@ -20,9 +20,9 @@ use Variable::Magic::TestValue;
 my $wiz = init_watcher 'copy', 'copy';
 
 SKIP: {
 my $wiz = init_watcher 'copy', 'copy';
 
 SKIP: {

- eval "use Tie::Array";
+ my $has_tie_array = do { local $@; eval { require Tie::Array; 1 } };

  skip 'Tie::Array required to test copy magic on arrays'
  skip 'Tie::Array required to test copy magic on arrays'

-                                             => (2 * 5 + 3) + (2 * 2 + 1) if $@;
+                             => (2 * 5 + 3) + (2 * 2 + 1) unless $has_tie_array;

  defined and diag "Using Tie::Array $_" for $Tie::Array::VERSION;
 
  tie my @a, 'Tie::StdArray';
  defined and diag "Using Tie::Array $_" for $Tie::Array::VERSION;
 
  tie my @a, 'Tie::StdArray';


@@ -55,8 +55,9 @@ SKIP: {
 }
 
 SKIP: {
 }
 
 SKIP: {

- eval "use Tie::Hash";
- skip 'Tie::Hash required to test copy magic on hashes' => 2 * 9 + 6 if $@;
+ my $has_tie_hash = do { local $@; eval { require Tie::Hash; 1 } };
+ skip 'Tie::Hash required to test copy magic on hashes'
+                                              => 2 * 9 + 6 unless $has_tie_hash;

  defined and diag "Using Tie::Hash $_" for $Tie::Hash::VERSION;
 
  tie my %h, 'Tie::StdHash';
  defined and diag "Using Tie::Hash $_" for $Tie::Hash::VERSION;
 
  tie my %h, 'Tie::StdHash';

diff --git a/t/28-uvar.t b/t/28-uvar.t
index 0eaf00130eba5b5efc0c3566e6bb283ed650d053..d44f9f1f0b38ad3ff17446eef7ab53b6b7a9e0c3 100644 (file)
--- a/t/28-uvar.t
+++ b/t/28-uvar.t
@@ -51,8 +51,9 @@ $x = watch { $h{a} } { fetch => 1 }, 'fetch directly with also non uvar magic';
 is $x, 1, 'uvar: fetch directly with also non uvar magic correctly';
 
 SKIP: {
 is $x, 1, 'uvar: fetch directly with also non uvar magic correctly';
 
 SKIP: {

- eval "use Tie::Hash";
- skip 'Tie::Hash required to test uvar magic on tied hashes' => 2 * 5 + 4 if $@;
+ my $has_tie_hash = do { local $@; eval { require Tie::Hash; 1 } };
+ skip 'Tie::Hash required to test uvar magic on tied hashes'
+                                              => 2 * 5 + 4 unless $has_tie_hash;

  defined and diag "Using Tie::Hash $_" for $Tie::Hash::VERSION;
 
  tie my %h, 'Tie::StdHash';
  defined and diag "Using Tie::Hash $_" for $Tie::Hash::VERSION;
 
  tie my %h, 'Tie::StdHash';

diff --git a/t/30-scalar.t b/t/30-scalar.t
index caf76c9c558b3a411c895d7cac1cbfa02166b8eb..c92b1869b2c33e09f2b42d0086808028ff441e3c 100644 (file)
--- a/t/30-scalar.t
+++ b/t/30-scalar.t
@@ -105,11 +105,13 @@ watch { $h{b} = 4 } { }, 'hash element: set after delete';
 SKIP: {
  my $SKIP;
 
 SKIP: {
  my $SKIP;
 

- unless (MGf_COPY) {
+ if (!MGf_COPY) {

   $SKIP = 'No copy magic for this perl';
  } else {
   $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 $@;
+  local $@;
+  unless (eval { require Tie::Array; 1 }) {
+   $SKIP = 'Tie::Array required to test clear magic on tied array values';
+  }

  }
 
  skip $SKIP => 3 if $SKIP;
  }
 
  skip $SKIP => 3 if $SKIP;

diff --git a/t/32-hash.t b/t/32-hash.t
index 1bbd3001e800f665d558272dc8d4c88591b36605..a7408fce4cf83985e9008ba4407b7a75a9c30bf3 100644 (file)
--- a/t/32-hash.t
+++ b/t/32-hash.t
@@ -76,11 +76,13 @@ watch { dispell %h, $wiz } { }, 'dispell';
 SKIP: {
  my $SKIP;
 
 SKIP: {
  my $SKIP;
 

- unless (VMG_UVAR) {
+ if (!VMG_UVAR) {

   $SKIP = 'uvar magic';
  } else {
   $SKIP = 'uvar magic';
  } else {

-  eval "use B::Deparse";
-  $SKIP = 'B::Deparse' if $@;
+  local $@;
+  unless (eval { require B::Deparse; 1 }) {
+   $SKIP = 'B::Deparse';
+  }

  }
  if ($SKIP) {
   $SKIP .= ' required to test uvar/clear interaction fix';
  }
  if ($SKIP) {
   $SKIP .= ' required to test uvar/clear interaction fix';