OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Eliminate literal line numbers in jump.exp 

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

gdb/testsuite/ChangeLog:

	* gdb.base/jump.c: Add eye-catchers.
	* gdb.base/jump.exp: Refer to eye-catchers instead of literal line
	numbers.
This commit is contained in:
Andreas Arnez 2014-10-24 11:57:22 +00:00 committed by Andreas Krebbel
parent 58fa2af0b3
commit 78f98cca31
3 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,9 @@
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.
2014-11-13 Andreas Arnez <arnez@linux.vnet.ibm.com>
* gdb.base/execd-prog.c: Add eye-catchers.

6
gdb/testsuite/gdb.base/jump.c
View File

@ -9,7 +9,7 @@ static int square (x)
int x;
#endif
{
return x*x;
return x*x; /* out-of-func */
}
@ -18,7 +18,7 @@ int main ()
int i = 99;
i++;
i = square (i);
i--;
i = square (i); /* bp-on-call */
i--; /* bp-on-non-call */
return 0;
}

29
gdb/testsuite/gdb.base/jump.exp
View File

@ -38,8 +38,9 @@ if ![runto_main] then {
# The statement doesn't contain a function call.
#
set bp_on_non_call 0
gdb_test_multiple "break 22" "break before jump to non-call" {
-re "\[Bb\]reakpoint (\[0-9\]*) at 0x\[0-9a-fA-F\]*: file .*${srcfile}, line 22.*$gdb_prompt $" {
set non_call_line [gdb_get_line_number "bp-on-non-call"]
gdb_test_multiple "break $non_call_line" "break before jump to non-call" {
-re "\[Bb\]reakpoint (${decimal}) at ${hex}: file .*${srcfile}, line $non_call_line.*$gdb_prompt $" {
set bp_on_non_call $expect_out(1,string)
pass "break before jump to non-call"
}
@ -47,15 +48,16 @@ gdb_test_multiple "break 22" "break before jump to non-call" {
# Can we jump to the statement? Do we stop there?
#
gdb_test "jump 22" "Breakpoint \[0-9\]*, .*${srcfile}:22.*" \
gdb_test "jump $non_call_line" "Breakpoint ${decimal}, .*${srcfile}:$non_call_line.*" \
"jump to non-call"
# Set a breakpoint on the statement that we're about to jump to.
# The statement does contain a function call.
#
set bp_on_call 0
gdb_test_multiple "break 21" "break before jump to call" {
-re "\[Bb\]reakpoint (\[0-9\]*) at 0x\[0-9a-fA-F\]*: file .*${srcfile}, line 21.*$gdb_prompt $" {
set call_line [gdb_get_line_number "bp-on-call"]
gdb_test_multiple "break $call_line" "break before jump to call" {
-re "\[Bb\]reakpoint (${decimal}) at ${hex}: file .*${srcfile}, line $call_line.*$gdb_prompt $" {
set bp_on_call $expect_out(1,string)
pass "break before jump to call"
}
@ -63,8 +65,8 @@ gdb_test_multiple "break 21" "break before jump to call" {
# Can we jump to the statement? Do we stop there?
#
gdb_test "jump 21" \
"Breakpoint \[0-9\]*, .*${srcfile}:21.*" \
gdb_test "jump $call_line" \
"Breakpoint ${decimal}, .*${srcfile}:$call_line.*" \
"jump to call"
# If we disable the breakpoint at the function call, and then
@ -73,7 +75,7 @@ gdb_test "jump 21" \
#
gdb_test_no_output "disable $bp_on_call" "disable breakpoint on call"
gdb_test "jump 21" "Breakpoint \[0-9\]*, .*${srcfile}:22.*" \
gdb_test "jump $call_line" "Breakpoint ${decimal}, .*${srcfile}:$non_call_line.*" \
"jump to call with disabled breakpoint"
# Verify that GDB responds gracefully to the "jump" command without
@ -86,7 +88,7 @@ gdb_test "jump" "Argument required .starting address.*" \
# Verify that GDB responds gracefully to the "jump" command with
# trailing junk.
#
gdb_test "jump 21 100" \
gdb_test "jump $call_line 100" \
"malformed linespec error: unexpected number, \"100\"" \
"jump with trailing argument junk"
@ -99,16 +101,17 @@ gdb_test "jump 21 100" \
# Try it both ways: confirming and not confirming the jump.
#
gdb_test "jump 12" \
set out_line [gdb_get_line_number "out-of-func"]
gdb_test "jump $out_line" \
"Not confirmed.*" \
"aborted jump out of current function" \
"Line 12 is not in `main'. Jump anyway.*y or n. $" \
"Line $out_line is not in `main'. Jump anyway.*y or n. $" \
"n"
gdb_test "jump 12" \
gdb_test "jump $out_line" \
"Continuing at.*" \
"jump out of current function" \
"Line 12 is not in `main'. Jump anyway.*y or n. $" \
"Line $out_line is not in `main'. Jump anyway.*y or n. $" \
"y"
gdb_exit