Test the workaround more extensively

diff --git a/MANIFEST b/MANIFEST
index 183e407ebb60a7ffba6f3980b8744526c0c8e4c7..aa5b24c2f3b4432107698a93796c73c4041dd250 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -18,4 +18,5 @@ t/91-pod.t
 t/92-pod-coverage.t
 t/95-portability-files.t
 t/99-kwalitee.t
-t/lib/indirect/TestRequired.pm
+t/lib/indirect/TestRequired1.pm
+t/lib/indirect/TestRequired2.pm

diff --git a/t/30-scope.t b/t/30-scope.t
index b0f29b594855b03fc2a73be2637ff52183dd91c3..fffaad9f5b8d7e17d30ff14fe20c595d5a9ff740 100644 (file)
--- a/t/30-scope.t
+++ b/t/30-scope.t
@@ -6,15 +6,16 @@ use warnings;
 my $tests;
 BEGIN { $tests = 18 }
 
-use Test::More tests => 1 + $tests + 1 + 2 + 2;
+use Test::More tests => 1 + $tests + 1 + 2 + 3 + 5;
 
 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"\s+at\s+\(eval\s+\d+\)\s+line\s+\d+/;
+ 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+/;
 }
 
 {
@@ -72,11 +73,35 @@ sub expect {
 {
  my @w;
  {
-  local $SIG{__WARN__} = sub { push @w, join '', @_ };
-  eval 'no indirect; use indirect::TestRequired';
+  local $SIG{__WARN__} = sub { push @w, join '', 'warn:', @_ };
+  eval "die qq{ok\\n}; no indirect; use indirect::TestRequired1; my \$x = new Foo;";
  }
- is         $@, '',  'require test didn\'t croak';
- is_deeply \@w, [ ], 'pragma didn\'t propagate into the required file';
+ 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';
 }
 
 __DATA__

diff --git a/t/lib/indirect/TestRequired.pm b/t/lib/indirect/TestRequired1.pm
similarity index 68%
rename from t/lib/indirect/TestRequired.pm
rename to t/lib/indirect/TestRequired1.pm
index c27d144ef9390902a37466c3fca237e2ac0b6585..cb1da6fa7a85bb28239a9523e323b6312edae0ed 100644 (file)
--- a/t/lib/indirect/TestRequired.pm
+++ b/t/lib/indirect/TestRequired1.pm
@@ -1,4 +1,4 @@
-package indirect::TestRequired;
+package indirect::TestRequired1;
 
 BEGIN { require strict; }
 

diff --git a/t/lib/indirect/TestRequired2.pm b/t/lib/indirect/TestRequired2.pm
new file mode 100644 (file)
index 0000000..b353cbc
--- /dev/null
+++ b/t/lib/indirect/TestRequired2.pm
@@ -0,0 +1,16 @@
+package indirect::TestRequired2;
+
+no indirect;
+
+BEGIN { delete $INC{'indirect/TestRequired1.pm'} }
+
+use lib 't/lib';
+use indirect::TestRequired1;
+
+eval {
+ my $y = new Baz;
+};
+
+eval 'my $z = new Blech';
+
+1;