diff options
| author | Andreas Arnez <arnez@linux.vnet.ibm.com> | 2014-10-24 12:05:10 +0000 |
|---|---|---|
| committer | Andreas Krebbel <krebbel@linux.vnet.ibm.com> | 2014-11-13 10:20:39 +0100 |
| commit | b0e59b8f1c5fecb1354de5664f50149ac964d98e (patch) | |
| tree | fd4e3c7cb40bed3d0d7b86efcb092c048ddff7fe | |
| parent | 78f98cca318cbf5f38d85a09f11e17cc3684ac51 (diff) | |
| download | gdb-b0e59b8f1c5fecb1354de5664f50149ac964d98e.zip gdb-b0e59b8f1c5fecb1354de5664f50149ac964d98e.tar.gz gdb-b0e59b8f1c5fecb1354de5664f50149ac964d98e.tar.bz2 | |
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.
| -rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/shlib-call.exp | 2 | ||||
| -rw-r--r-- | 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 f1ef4bb..0ab8225 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,11 @@ 2014-11-13 Andreas Arnez <arnez@linux.vnet.ibm.com> + * 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 <arnez@linux.vnet.ibm.com> + * gdb.base/jump.c: Add eye-catchers. * gdb.base/jump.exp: Refer to eye-catchers instead of literal line numbers. diff --git a/gdb/testsuite/gdb.base/shlib-call.exp b/gdb/testsuite/gdb.base/shlib-call.exp index 74a5429..aca0308 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 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 |