X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Findirect.git;a=blobdiff_plain;f=t%2F30-scope.t;h=2b937f78fc63882e8df604ecef21626e1a0569d6;hp=1e1dcf3d8fe7c2123521fc89cb70e6c3e3467da4;hb=refs%2Ftags%2Frt47902;hpb=88fea8eaa6fc01af02741dcf05de7fd24fe8fc1d

diff --git a/t/30-scope.t b/t/30-scope.t
index 1e1dcf3..2b937f7 100644
--- a/t/30-scope.t
+++ b/t/30-scope.t
@@ -6,13 +6,16 @@ use warnings;
 my $tests;
 BEGIN { $tests = 18 }
 
-use Test::More tests => 1 + $tests + 1 + 2;
+use Test::More tests => 1 + $tests + 1 + 2 + 3 + 5 + 1;
+
+use lib 't/lib';
 
 my %wrong = map { $_ => 1 } 2, 3, 5, 7, 9, 10, 14, 15, 17, 18;
 
 sub expect {
- my ($pkg) = @_;
- return qr/^warn:Indirect\s+call\s+of\s+method\s+"new"\s+on\s+object\s+"$pkg"/;
+ my ($pkg, $file) = @_;
+ $file = $file ? quotemeta $file : '\(eval\s+\d+\)';
+ return qr/^warn:Indirect\s+call\s+of\s+method\s+"new"\s+on\s+object\s+"$pkg"\s+at\s+$file\s+line\s+\d+/;
 }
 
 {
@@ -59,7 +62,7 @@ sub expect {
    no indirect;
    eval 'my $x = new Bar';
   }
-  if ($] < 5.010) {
+  if ($] < 5.009005) {
    is($w, '', "eval 'no indirect; my \$x = new Bar'");
   } else {
    like($w, expect('Bar'), "no indirect; eval 'my \$x = new Bar'");
@@ -67,6 +70,50 @@ sub expect {
  }
 }
 
+{
+ my @w;
+ {
+  local $SIG{__WARN__} = sub { push @w, join '', 'warn:', @_ };
+  eval "die qq{ok\\n}; no indirect; use indirect::TestRequired1; my \$x = new Foo;";
+ }
+ is         $@, "ok\n",        'first require test doesn\'t croak prematurely';
+ my $w = shift @w;
+ like       $w, expect('Foo'), 'first require test catch errors in current scope';
+ is_deeply \@w, [ ],           'first require test doesn\'t propagate into the required file';
+}
+
+{
+ my @w;
+ {
+  local $SIG{__WARN__} = sub { push @w, join '', 'warn:', @_ };
+  eval "die qq{ok\\n}; no indirect; use indirect::TestRequired2; my \$x = new Bar;";
+ }
+ @w = grep !/^warn:Attempt\s+to\s+free\s+unreferenced/, @w if $] <= 5.008003;
+ is   $@, "ok\n", 'second require test doesn\'t croak prematurely';
+ my $w = shift @w;
+ like $w, expect('Baz', 't/lib/indirect/TestRequired2.pm'),
+                                     'second require test caught error for Baz';
+ SKIP: {
+  skip 'The pragma doesn\'t propagte into eval STRING before perl 5.10' => 1
+                                                               if $] < 5.009005;
+  $w = shift @w;
+  like $w, expect('Blech'), 'second require test caught error for Blech';
+ }
+ $w = shift @w;
+ like       $w, expect('Bar'), 'second require test caught error for Bar';
+ is_deeply \@w, [ ],           'second require test doesn\'t have more errors';
+}
+
+{
+ eval <<' SNIP';
+  return;
+  no indirect ':fatal';
+  use indirect::Test1::il1 ();
+  use indirect::Test1::il2 ();
+ SNIP
+ is $@, '', 'RT #47902';
+}
+
 __DATA__
 my $a = new P1;