Imported Upstream version 59upstream/59

1 files changed, 16 insertions, 0 deletions

diff --git a/test/errchk b/test/errchk
index fbb021ce4..e89d75950 100755
--- a/test/errchk
+++ b/test/errchk
@@ -81,6 +81,19 @@ sub chk {
 			next;
 		}
 		$regexp = $1;
+		
+		# Turn relative line number in message into absolute line number.
+		if($regexp =~ /LINE(([+-])([0-9]+))?/) {
+			my $n = $line;
+			if(defined($1)) {
+				if($2 eq "+") {
+					$n += int($3);
+				} else {
+					$n -= int($3);
+				}
+			}
+			$regexp = "$`$file:$n$'";
+		}
 
 		@errmsg = grep { /$file:$line[:[]/ } @out;
 		@out = grep { !/$file:$line[:[]/ } @out;
@@ -93,6 +106,9 @@ sub chk {
 		if(@match == 0) {
 			bug();
 			print STDERR "errchk: $file:$line: error message does not match '$regexp'\n";
+			foreach my $l (@errmsg) {
+				print STDERR "> $l";
+			}
 			next;
 		}
 	}