From e2f6c966284e2f204779e9c7becf260bd4fe5117 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Wed, 19 Mar 2014 15:22:44 +0000 Subject: [PATCH] gdb.base/async.exp: Don't hardcode line numbers. gdb/testsuite/ 2014-03-19 Pedro Alves * gdb.base/async.c (main): Add "jump here" and "until here" line marker comments. * gdb.base/async.exp (jump_here): New global. (jump& test): Use it. (until_here): New global. (until& test): Use it. --- gdb/testsuite/ChangeLog | 9 +++++++++ gdb/testsuite/gdb.base/async.c | 4 ++-- gdb/testsuite/gdb.base/async.exp | 12 ++++++++---- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index c1349b6532c..fa7b282af51 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2014-03-19 Pedro Alves + + * gdb.base/async.c (main): Add "jump here" and "until here" line + marker comments. + * gdb.base/async.exp (jump_here): New global. + (jump& test): Use it. + (until_here): New global. + (until& test): Use it. + 2014-03-19 Pedro Alves * gdb.base/async.exp: Don't frob gdb_protocol. diff --git a/gdb/testsuite/gdb.base/async.c b/gdb/testsuite/gdb.base/async.c index 0d9c8752b70..fb5308248a8 100644 --- a/gdb/testsuite/gdb.base/async.c +++ b/gdb/testsuite/gdb.base/async.c @@ -30,9 +30,9 @@ main () z = 9; y = foo (); z = y; - y = y + 2; + y = y + 2; /* jump here */ y = baz (); - return 0; + return 0; /* until here */ } diff --git a/gdb/testsuite/gdb.base/async.exp b/gdb/testsuite/gdb.base/async.exp index 1f465a66ba2..d4b2b2d8080 100644 --- a/gdb/testsuite/gdb.base/async.exp +++ b/gdb/testsuite/gdb.base/async.exp @@ -103,17 +103,21 @@ gdb_expect { timeout { fail "(timeout) finish &" } } -send_gdb "jump 33&\n" +set jump_here [gdb_get_line_number "jump here"] + +send_gdb "jump $jump_here&\n" gdb_expect { - -re "^jump 33&.*Continuing at $hex.*$gdb_prompt.*Breakpoint 2, baz \\(\\) at.*async.c.*return 5.*completed\.\r\n" \ + -re "^jump $jump_here&.*Continuing at $hex.*$gdb_prompt.*Breakpoint 2, baz \\(\\) at.*async.c.*return 5.*completed\.\r\n" \ { pass "jump &" } -re ".*$gdb_prompt.*completed\.$" { fail "jump &" } timeout { fail "(timeout) jump &" } } -send_gdb "until 35&\n" +set until_here [gdb_get_line_number "until here"] + +send_gdb "until $until_here&\n" gdb_expect { - -re "^until 35&.*$gdb_prompt.*$hex in main \\(\\) at.*async.c.*y = baz \\(\\).*completed\.\r\n" \ + -re "^until $until_here&.*$gdb_prompt.*$hex in main \\(\\) at.*async.c.*y = baz \\(\\).*completed\.\r\n" \ { pass "until &" } -re "$gdb_prompt.*completed\.$" { fail "until &" } timeout { fail "(timeout) until &" } -- 2.30.2