Eliminate literal line numbers in so-impl-ld.exp

Remove literal line numbers from the regexps in so-impl-ld.exp.  Add
appropriate eye-catchers to solib1.c and refer to those instead.

gdb/testsuite/ChangeLog:

	* gdb.base/solib1.c: Add eye-catchers.
	* gdb.base/so-impl-ld.exp: Match against eye-catchers instead of
	literal line numbers.
This commit is contained in:
Andreas Arnez 2014-10-23 13:56:52 +00:00 committed by Andreas Krebbel
parent f41e4712a7
commit 9ecfcd1d02
3 changed files with 10 additions and 4 deletions

View file

@ -1,3 +1,9 @@
2014-11-13 Andreas Arnez <arnez@linux.vnet.ibm.com>
* gdb.base/solib1.c: Add eye-catchers.
* gdb.base/so-impl-ld.exp: Match against eye-catchers instead of
literal line numbers.
2014-11-12 Pedro Alves <palves@redhat.com>
* gdb.threads/leader-exit.exp: Test sending ctrl-c works after the

View file

@ -61,12 +61,12 @@ gdb_test "next" "21\[ \t\]*result = solib_main .result.;" \
# Verify that we can step into the second shlib call.
#
gdb_test "step" "solib_main .arg=10000. at.*${libfile}.c:17.*" \
gdb_test "step" "solib_main .arg=10000. at.*${libfile}.c:${decimal}.* HERE .*" \
"step into solib call"
# Verify that we can step within the shlib call.
#
gdb_test "next" "18\[ \t\]*\}" "step in solib call"
gdb_test "next" "${decimal}\[ \t\]*\}.* STEP .*" "step in solib call"
# Verify that we can step out of the shlib call, and back out into
# the caller.

View file

@ -14,5 +14,5 @@ int solib_main (arg)
#endif
#endif
{
return arg*arg;
}
return arg*arg; /* HERE */
} /* STEP */