update autodie test for new Carp stack trace form

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 3633ac2..e247f71 100755 (executable)
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -248,6 +248,9 @@ use File::Glob qw(:case);
                 t/system.t
                 )
         ],
+       # Test got broken by Carp change; update to be merged upstream
+       # [rt.cpan.org #88076].
+        'CUSTOMIZED' => ['t/backcompat.t'],
         'UPSTREAM'   => 'cpan',
     },
 

diff --git a/cpan/autodie/t/backcompat.t b/cpan/autodie/t/backcompat.t
index b26c421..33a193c 100644 (file)
--- a/cpan/autodie/t/backcompat.t
+++ b/cpan/autodie/t/backcompat.t
@@ -8,7 +8,7 @@ eval {
     open(my $fh, '<', NO_SUCH_FILE);
 };
 
-my $old_msg = qr{Can't open\(GLOB\(0x[0-9a-f]+\), <, xyzzy_this_file_is_not_here\): .* at \(eval \d+\)(?:\[.*?\])? line \d+\.?\s+main::__ANON__\('GLOB\(0x[0-9a-f]+\)',\s*'<',\s*'xyzzy_this_file_is_not_here'\) called at \S+ line \d+\s+eval \Q{...}\E called at \S+ line \d+};
+my $old_msg = qr{Can't open\(GLOB\(0x[0-9a-f]+\), <, xyzzy_this_file_is_not_here\): .* at \(eval \d+\)(?:\[.*?\])? line \d+\.?\s+main::__ANON__\('?GLOB\(0x[0-9a-f]+\)'?,\s*['"]<['"],\s*['"]xyzzy_this_file_is_not_here['"]\) called at \S+ line \d+\s+eval \Q{...}\E called at \S+ line \d+};
 
 like($@,$old_msg,"Backwards compat ugly messages");
 is(ref($@),"", "Exception is a string, not an object");

diff --git a/t/porting/customized.dat b/t/porting/customized.dat
index 6bf9ec7..81605ae 100644 (file)
--- a/t/porting/customized.dat
+++ b/t/porting/customized.dat
@@ -15,6 +15,7 @@ Text::Balanced cpan/Text-Balanced/t/08_extvar.t 0776ef2cbdad5b1fbefb300541d07921
 Text::Balanced cpan/Text-Balanced/t/09_gentag.t 42361b5dfb3bb728bce20f4fb0d92ccfb27c2ba7
 Text::ParseWords cpan/Text-ParseWords/t/ParseWords.t 9bae51c9b944cd5c0bbabe9d397e573976a2be8e
 Text::ParseWords cpan/Text-ParseWords/t/taint.t 3cff0dae812801f7aa1738d6070508f2c5bcc2e5
+autodie cpan/autodie/t/backcompat.t c6d500af89a229d6827f7e3bd4f9355329e9415b
 libnet cpan/libnet/Makefile.PL 6b10ac98e672bfebb8f49b9720a93442645208b3
 podlators cpan/podlators/scripts/pod2man.PL f81acf53f3ff46cdcc5ebdd661c5d13eb35d20d6
 podlators cpan/podlators/scripts/pod2text.PL b4693fcfe4a0a1b38a215cfb8985a65d5d025d69