From b0e59b8f1c5fecb1354de5664f50149ac964d98e Mon Sep 17 00:00:00 2001 From: Andreas Arnez Date: Fri, 24 Oct 2014 12:05:10 +0000 Subject: [PATCH] Eliminate literal line numbers in shlib-call.exp 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/ChangeLog | 6 ++++++ gdb/testsuite/gdb.base/shlib-call.exp | 2 +- gdb/testsuite/gdb.base/shr2.c | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index f1ef4bb4072..0ab82256a1d 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2014-11-13 Andreas Arnez + + * gdb.base/shr2.c: Add eye-catcher. + * gdb.base/shlib-call.exp: Refer to eye-catcher instead of literal + line number. + 2014-11-13 Andreas Arnez * gdb.base/jump.c: Add eye-catchers. diff --git a/gdb/testsuite/gdb.base/shlib-call.exp b/gdb/testsuite/gdb.base/shlib-call.exp index 74a54299bd0..aca03083f07 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 ${decimal}, shr2 \\(.*\\) at.*shr2\\.c:${decimal}.*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 de34986d76d..36a71b3554d 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 -- 2.30.2