fixing test failures in 5.22. Patch by Petr Písař. I think

PadreIDE · Dec 1, 2015 · ca6b762 · ca6b762
1 parent 8e620f8
commit ca6b762
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/lib/Parse/ErrorString/Perl.pm b/lib/Parse/ErrorString/Perl.pm
@@ -93,6 +93,7 @@ sub _prepare_diagnostics {
 	my %errors;
 	foreach my $item ( $pom->head1->[1]->over->[0]->item ) {
 		my $header = $item->title;
+		$header =~ s/\n/ /g;
 
 		my $content = $item->content;
 		$content =~ s/\s*$//;

diff --git a/t/04-perldiag.t b/t/04-perldiag.t
@@ -13,10 +13,27 @@ use Test::Differences;
 #
 # $hell;
 
-my $msg_compile = <<'ENDofMSG';
+my $msg_compile;
+
+if ( $] <  5.021004 ) {
+	$msg_compile = <<'ENDofMSG';
 Global symbol "$kaboom" requires explicit package name at error.pl line 8.
 Execution of error.pl aborted due to compilation errors.
 ENDofMSG
+} else {
+	$msg_compile = <<'ENDofMSG';
+Global symbol "$kaboom" requires explicit package name (did you forget to declare "my $kaboom"?) at error.pl line 8.
+Execution of error.pl aborted due to compilation errors.
+ENDofMSG
+}
+
+my $message;
+
+if ( $] < 5.021004 ) {
+	$message = q{Global symbol "$kaboom" requires explicit package name};
+} else {
+	$message = q{Global symbol "$kaboom" requires explicit package name (did you forget to declare "my $kaboom"?)};
+}
 
 my $diagnostics;
 
@@ -56,7 +73,7 @@ $diagnostics =~ s/\s\n/\n/gs;
 
 my $parser         = Parse::ErrorString::Perl->new;
 my @errors_compile = $parser->parse_string($msg_compile);
-is( $errors_compile[0]->message, 'Global symbol "$kaboom" requires explicit package name', 'message' );
+is( $errors_compile[0]->message, $message, 'message' );
 
 #ok($errors_compile[0]->diagnostics eq $diagnostics, 'diagnostics');
 my $obtained_diagnostics = $errors_compile[0]->diagnostics;