gdb: Remove hard-coded line number from test

Message ID 20171019131004.14544-1-andrew.burgess@embecosm.com
State New, archived
Headers

Commit Message

Andrew Burgess Oct. 19, 2017, 1:10 p.m. UTC
  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.
---
 gdb/testsuite/ChangeLog                | 5 +++++
 gdb/testsuite/gdb.linespec/ls-errs.exp | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
  

Comments

Simon Marchi Oct. 19, 2017, 2:17 p.m. UTC | #1
On 2017-10-19 09:10, Andrew Burgess wrote:
> 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.
> ---
>  gdb/testsuite/ChangeLog                | 5 +++++
>  gdb/testsuite/gdb.linespec/ls-errs.exp | 4 ++--
>  2 files changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/gdb/testsuite/gdb.linespec/ls-errs.exp
> b/gdb/testsuite/gdb.linespec/ls-errs.exp
> index f55cd0e8e9..ee8bb087f0 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

LGTM, thanks.

Simon
  

Patch

diff --git a/gdb/testsuite/gdb.linespec/ls-errs.exp b/gdb/testsuite/gdb.linespec/ls-errs.exp
index f55cd0e8e9..ee8bb087f0 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