[PATCH 08/16] Eliminate literal line numbers in shlib-call.exp

Andreas Arnez
2014-10-29T16:02:41Z

Remove the literal line number from a regexp in shlib-call.exp. Add
an appropriate eye-catcher to shr2.c and refer to that instead.

gdb/testsuite/ChangeLog:

* gdb.base/shr2.c: Add eye-catcher.
* gdb.base/shlib-call.exp: Refer to eye-catcher instead of literal
line number.
---
gdb/testsuite/gdb.base/shlib-call.exp | 2 +-
gdb/testsuite/gdb.base/shr2.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gdb/testsuite/gdb.base/shlib-call.exp b/gdb/testsuite/gdb.base/shlib-call.exp
index 74a5429..f3f7bee 100644
--- a/gdb/testsuite/gdb.base/shlib-call.exp
+++ b/gdb/testsuite/gdb.base/shlib-call.exp
@@ -111,7 +111,7 @@ gdb_test "break shr2" \
"breakpoint function shr2"

gdb_test "continue" \
- "Continuing\\..*Breakpoint \[0-9\]+, shr2 \\(.*\\) at.*shr2\\.c:7.*7.*return 2.x;" \
+ "Continuing\\..*Breakpoint \[0-9\]+, shr2 \\(.*\\) at.*shr2\\.c:.*shr2-return \\*\\/" \
"run until breakpoint set at a function"

diff --git a/gdb/testsuite/gdb.base/shr2.c b/gdb/testsuite/gdb.base/shr2.c
index de34986..36a71b3 100644
--- a/gdb/testsuite/gdb.base/shr2.c
+++ b/gdb/testsuite/gdb.base/shr2.c
@@ -4,7 +4,7 @@ int shr2(int x)
int shr2(x) int x;
#endif
{
- return 2*x;
+ return 2*x; /* shr2-return */
}

#ifdef PROTOTYPES
--
1.8.4.2