From: Andrew Burgess <andrew.burgess@embecosm.com>
Date: Fri, 13 Oct 2017 14:22:17 +0000 (+0100)
Subject: gdb: Remove hard-coded line number from test
X-Git-Tag: users/ARM/embedded-binutils-master-2017q4~520
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=49a4ce2eae231ae627ab9a312256c6e402b5a27e;p=thirdparty%2Fbinutils-gdb.git

gdb: Remove hard-coded line number from test

Removes the use of a hard-coded line number from a test.

gdb/testsuite/ChangeLog:

	* gdb.linespec/ls-errs.exp (do_test): Update comment, use line
	number from variable rather than hard-coded.
---

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e8f95ed6910..6a984aee8ba 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-10-19  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+	* gdb.linespec/ls-errs.exp (do_test): Update comment, use line
+	number from variable rather than hard-coded.
+
 2017-10-19  Pedro Alves  <palves@redhat.com>
 
 	* gdb.base/long-inferior-output.c: New file.
diff --git a/gdb/testsuite/gdb.linespec/ls-errs.exp b/gdb/testsuite/gdb.linespec/ls-errs.exp
index f55cd0e8e9d..ee8bb087f07 100644
--- a/gdb/testsuite/gdb.linespec/ls-errs.exp
+++ b/gdb/testsuite/gdb.linespec/ls-errs.exp
@@ -117,10 +117,10 @@ proc do_test {lang} {
     foreach x $invalid_offsets {
 	set offset $x
 
-	# Relative offsets are relative to line 16.  Adjust
+	# Relative offsets are relative to the current line.  Adjust
 	# expected offset from error message accordingly.
 	if {[string index $x 0] == "+" || [string index $x 0] == "-"} {
-	    incr offset 24
+	    incr offset $bp_location
 	}
 	test_break $x invalid_offset $offset
 	test_break "-line $x" invalid_offset $offset