X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F17-ctl.t;h=19dd8649f41aef264fed2a4874ef48bdbc682a84;hb=ae89b589d2187cf0ed57bbb6132b9d4a8da29abb;hp=4235938027d07dc904d2897fa3291e4c32b9af32;hpb=3091cc2c4142d43816115eb596b62fab8fa6b5c2;p=perl%2Fmodules%2FVariable-Magic.git

diff --git a/t/17-ctl.t b/t/17-ctl.t
index 4235938..19dd864 100644
--- a/t/17-ctl.t
+++ b/t/17-ctl.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 4 * 8 + 10 + 1 + 1;
+use Test::More tests => 4 * 8 + 4 * (2 * 6 + 1) + 10 + 1 + 1;
 
 use Variable::Magic qw<wizard cast VMG_UVAR>;
 
@@ -128,6 +128,135 @@ for my $t (@scalar_tests) {
 
 # Free
 
+{
+ my $wiz   = wizard free => sub { die 'avocado' };
+ my $check = sub { like $@, expect('avocado', $0), $_[0] };
+
+ for my $local_out (0, 1) {
+  for my $local_in (0, 1) {
+   my $desc   = "die in free callback";
+   if ($local_in or $local_out) {
+    $desc .= ' with $@ localized ';
+    if ($local_in and $local_out) {
+     $desc .= 'inside and outside';
+    } elsif ($local_in) {
+     $desc .= 'inside';
+    } else {
+     $desc .= 'outside';
+    }
+   }
+
+   local $@ = $local_out ? 'xxx' : undef;
+   eval {
+    local $@ = 'yyy' if $local_in;
+    my $x;
+    cast $x, $wiz;
+   };
+   $check->("$desc at eval BLOCK 1a");
+
+   local $@ = $local_out ? 'xxx' : undef;
+   eval q{
+    local $@ = 'yyy' if $local_in;
+    my $x;
+    cast $x, $wiz;
+   };
+   $check->("$desc at eval STRING 1a");
+
+   local $@ = $local_out ? 'xxx' : undef;
+   eval {
+    my $x;
+    local $@ = 'yyy' if $local_in;
+    cast $x, $wiz;
+   };
+   $check->("$desc at eval BLOCK 1b");
+
+   local $@ = $local_out ? 'xxx' : undef;
+   eval q{
+    my $x;
+    local $@ = 'yyy' if $local_in;
+    cast $x, $wiz;
+   };
+   $check->("$desc at eval STRING 1b");
+
+   local $@ = $local_out ? 'xxx' : undef;
+   eval {
+    local $@ = 'yyy' if $local_in;
+    my $x;
+    my $y = \$x;
+    &cast($y, $wiz);
+   };
+   $check->("$desc at eval BLOCK 2a");
+
+   local $@ = $local_out ? 'xxx' : undef;
+   eval q{
+    local $@ = 'yyy' if $local_in;
+    my $x;
+    my $y = \$x;
+    &cast($y, $wiz);
+   };
+   $check->("$desc at eval STRING 2a");
+
+   local $@ = $local_out ? 'xxx' : undef;
+   eval {
+    my $x;
+    my $y = \$x;
+    local $@ = 'yyy' if $local_in;
+    &cast($y, $wiz);
+   };
+   $check->("$desc at eval BLOCK 2b");
+
+   local $@ = $local_out ? 'xxx' : undef;
+   eval q{
+    my $x;
+    my $y = \$x;
+    local $@ = 'yyy' if $local_in;
+    &cast($y, $wiz);
+   };
+   $check->("$desc at eval STRING 2b");
+
+   local $@ = $local_out ? 'xxx' : undef;
+   eval {
+    local $@ = 'yyy' if $local_in;
+    my $x;
+    cast $x, $wiz;
+    my $y = 1;
+   };
+   $check->("$desc at eval BLOCK 3");
+
+   local $@ = $local_out ? 'xxx' : undef;
+   eval q{
+    local $@ = 'yyy' if $local_in;
+    my $x;
+    cast $x, $wiz;
+    my $y = 1;
+   };
+   $check->("$desc at eval STRING 3");
+
+   local $@ = $local_out ? 'xxx' : undef;
+   eval {
+    local $@ = 'yyy' if $local_in;
+    {
+     my $x;
+     cast $x, $wiz;
+    }
+   };
+   $check->("$desc at block in eval BLOCK");
+
+   local $@ = $local_out ? 'xxx' : undef;
+   eval q{
+    local $@ = 'yyy' if $local_in;
+    {
+     my $x;
+     cast $x, $wiz;
+    }
+   };
+   $check->("$desc at block in eval STRING");
+
+   ok defined($desc), "$desc did not over-unwind the save stack";
+  }
+ }
+}
+
 my $wiz;
 
 eval {
@@ -137,7 +266,7 @@ eval {
  cast $x, $wiz, sub { die "spinach" };
 };
 
-like $@, expect('spinach', $0), 'die in free callback';
+like $@, expect('spinach', $0), 'die in sub in free callback';
 
 eval {
  $wiz = wizard free => sub { die 'zucchini' };
@@ -226,13 +355,19 @@ sub run_perl {
 
 my $has_capture_tiny = do {
  local $@;
- eval 'use Capture::Tiny 0.08 (); 1'
+ eval {
+  require Capture::Tiny;
+  Capture::Tiny->VERSION('0.08');
+ }
 };
 if ($has_capture_tiny) {
- my $output = Capture::Tiny::capture_merged(sub { run_perl <<' CODE' });
+ local $@;
+ my $output = eval {
+  Capture::Tiny::capture_merged(sub { run_perl <<'  CODE' });
 print STDOUT "pants\n";
 print STDERR "trousers\n";
- CODE
+  CODE
+ };
  unless (defined $output and $output =~ /pants/ and $output =~ /trousers/) {
   $has_capture_tiny = 0;
  }
@@ -266,10 +401,10 @@ SKIP:
  skip 'No working Capture::Tiny is installed'=> $count unless $has_capture_tiny;
 
  my $output = Capture::Tiny::capture_merged(sub { run_perl <<' CODE' });
-use Variable::Magic qw<wizard cast>; BEGIN { cast %::, wizard fetch => sub { die q[raddish] } } hlagh()
+use Variable::Magic qw<wizard cast>; BEGIN { cast %derp::, wizard fetch => sub { die q[raddish] } } derp::hlagh()
  CODE
  skip 'Test code didn\'t run properly' => $count unless defined $output;
- like $output, qr/^(?:raddish at -e line \d+\.\n)+Execution(?s:.*)/,
+ like $output, expect('raddish', '-e', "\nExecution(?s:.*)"),
                'die in free callback at compile time and not in eval string';
  --$count;
 }