Protect $@ inside Variable::Magic::TestWatcher::init_watcher

[perl/modules/Variable-Magic.git] / t / lib / Variable / Magic / TestWatcher.pm

diff --git a/t/lib/Variable/Magic/TestWatcher.pm b/t/lib/Variable/Magic/TestWatcher.pm
index bcbd67e5987ffa91d6c85268df2a72c19c1b1add..a8499226e06232d82de7b5ca2d67492b4149e143 100644 (file)
--- a/t/lib/Variable/Magic/TestWatcher.pm
+++ b/t/lib/Variable/Magic/TestWatcher.pm
@@ -5,12 +5,12 @@ use warnings;
 
 use Test::More;
 
-use Carp qw/croak/;
-use Variable::Magic qw/wizard/;
+use Carp qw<croak>;
+use Variable::Magic qw<wizard>;
 
-use base qw/Exporter/;
+use base qw<Exporter>;
 
-our @EXPORT = qw/init_watcher watch/;
+our @EXPORT = qw<init_watcher watch>;
 
 sub _types {
  my $t = shift;
@@ -28,6 +28,7 @@ sub init_watcher ($;$) {
  croak 'can\'t initialize twice' if defined $wiz;
  my $types = _types shift;
  $prefix   = (defined) ? "$_: " : '' for shift;
+ local $@;
  %mg  = ();
  $wiz = eval 'wizard ' . join(', ', map {
   "$_ => sub { \$mg{$_}++;" . ($_ eq 'len' ? '$_[2]' : '0') . '}'
@@ -45,7 +46,10 @@ sub watch (&;$$) {
  my @ret;
  local %mg = ();
  local $Test::Builder::Level = ($Test::Builder::Level || 0) + 1;
- if (defined $want and not $want) { # scalar context
+ local $@;
+ if (not defined $want) { # void context
+  eval { $code->() };
+ } elsif (not $want) { # scalar context
   $ret[0] = eval { $code->() };
  } else {
   @ret = eval { $code->() };