From 79b443187ee06d8ee7eedc29012e2b68235e3cd1 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Wed, 4 Jan 2012 17:52:12 -0600 Subject: use filenames in the "from" part too this also stops using "caller", which can produce incorrect results if there are multiple packages in a file, or if you follow it up too far (saying that the cycle is from 'main' isn't correct) --- t/basic.t | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 't/basic.t') diff --git a/t/basic.t b/t/basic.t index 62d92f5..ea59925 100644 --- a/t/basic.t +++ b/t/basic.t @@ -12,7 +12,7 @@ circular::require->unimport; my $warnings; local $SIG{__WARN__} = sub { $warnings .= $_[0] }; use_ok('Foo'); - is($warnings, "Circular require detected: Foo.pm (from Baz)\nCircular require detected: Baz.pm (from Bar)\n", "correct warnings"); + is($warnings, "Circular require detected: Foo.pm (from Baz.pm)\nCircular require detected: Baz.pm (from Bar.pm)\n", "correct warnings"); clear(); } @@ -20,7 +20,7 @@ circular::require->unimport; my $warnings; local $SIG{__WARN__} = sub { $warnings .= $_[0] }; use_ok('Bar'); - is($warnings, "Circular require detected: Baz.pm (from Foo)\nCircular require detected: Bar.pm (from Baz)\n", "correct warnings"); + is($warnings, "Circular require detected: Baz.pm (from Foo.pm)\nCircular require detected: Bar.pm (from Baz.pm)\n", "correct warnings"); clear(); } @@ -28,7 +28,7 @@ circular::require->unimport; my $warnings; local $SIG{__WARN__} = sub { $warnings .= $_[0] }; use_ok('Baz'); - is($warnings, "Circular require detected: Baz.pm (from Foo)\n", "correct warnings"); + is($warnings, "Circular require detected: Baz.pm (from Foo.pm)\nCircular require detected: Baz.pm (from Bar.pm)\n", "correct warnings"); clear(); } -- cgit v1.2.3-54-g00ecf