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

* gdb.base/attach.exp (do_attach_tests): Matching pattern for 

temporary breakpoint to match "Temporary breakpoint".
	* gdb.base/break.exp (delete_breakpoints): Likewise.
	* gdb.base/call-ar-st.exp (get_debug_format): Likewise.
	* gdb.base/commands.exp (temporary_breakpoint_commands): Likewise.
	* gdb.base/display.exp: Likewise.
	* gdb.base/foll-exec.exp (do_exec_tests): Likewise.
	* gdb.base/foll-fork.exp (catch_fork_child_follow): Likewise.
	* gdb.base/restore.exp (restore_tests): Likewise.
	* gdb.base/sepdebug.exp: Likewise.
	* gdb.base/watchpoint.exp: Likewise.
	* gdb.mi/mi-cli.exp: Added argument for new "disp" field.
	* gdb.mi/mi-pending.exp: Likewise.
	* gdb.mi/mi-simplerun.exp (test_running_the_program): Likewise.
	* gdb.mi/mi-until.exp (test_runnint_to_foo): Likewise.
	* gdb.mi/mi-var-cmd.exp: Likewise.
	* gdb.mi/mi-var-display.exp: Likewise.
	* gdb.mi/mi2-cli.exp: Likewise.
	* gdb.mi/mi2-simplerun.exp (test_running_the_program): Likewise.
	* gdb.mi/mi2-until.exp (test_running_to_foo): Likewise.
	* gdb.mi/mi2-var-display.exp: Likewise.
	* lib/gdb.exp (gdb_breakpoint): Pattern for temporary breakpoint.
	* lib/mi-support.exp (mi_runto_helper): Use "after_reason" argument for
	new "disp" field.
	(mi_expect_stop): Move after_reason argument to be really after
	reason. This is to support fix for PR2424.
This commit is contained in:
Aleksandar Ristovski 2008-04-15 14:33:55 +00:00
parent 2cec12e55b
commit 18ac113bcc
23 changed files with 104 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,32 @@
2008-04-15 Aleksandar Ristovski <aristovski@qnx.com>
* gdb.base/attach.exp (do_attach_tests): Matching pattern for
temporary breakpoint to match "Temporary breakpoint".
* gdb.base/break.exp (delete_breakpoints): Likewise.
* gdb.base/call-ar-st.exp (get_debug_format): Likewise.
* gdb.base/commands.exp (temporary_breakpoint_commands): Likewise.
* gdb.base/display.exp: Likewise.
* gdb.base/foll-exec.exp (do_exec_tests): Likewise.
* gdb.base/foll-fork.exp (catch_fork_child_follow): Likewise.
* gdb.base/restore.exp (restore_tests): Likewise.
* gdb.base/sepdebug.exp: Likewise.
* gdb.base/watchpoint.exp: Likewise.
* gdb.mi/mi-cli.exp: Added argument for new "disp" field.
* gdb.mi/mi-pending.exp: Likewise.
* gdb.mi/mi-simplerun.exp (test_running_the_program): Likewise.
* gdb.mi/mi-until.exp (test_runnint_to_foo): Likewise.
* gdb.mi/mi-var-cmd.exp: Likewise.
* gdb.mi/mi-var-display.exp: Likewise.
* gdb.mi/mi2-cli.exp: Likewise.
* gdb.mi/mi2-simplerun.exp (test_running_the_program): Likewise.
* gdb.mi/mi2-until.exp (test_running_to_foo): Likewise.
* gdb.mi/mi2-var-display.exp: Likewise.
* lib/gdb.exp (gdb_breakpoint): Pattern for temporary breakpoint.
* lib/mi-support.exp (mi_runto_helper): Use "after_reason" argument for
new "disp" field.
(mi_expect_stop): Move after_reason argument to be really after
reason. This is to support fix for PR2424.
2008-04-15 Jan Kratochvil <jan.kratochvil@redhat.com>
* gdb.dwarf2/dw2-ranges.S: New stub `.file' directive.

2
gdb/testsuite/gdb.base/attach.exp
View File

@ -238,7 +238,7 @@ proc do_attach_tests {} {
send_gdb "tbreak 19\n"
gdb_expect {
-re "Breakpoint .*at.*$srcfile, line 19.*$gdb_prompt $" {
-re "Temporary breakpoint .*at.*$srcfile, line 19.*$gdb_prompt $" {
pass "after attach2, set tbreak postloop"
}
-re "$gdb_prompt $" {

12
gdb/testsuite/gdb.base/break.exp
View File

@ -234,13 +234,13 @@ delete_breakpoints
# test temporary breakpoint at function
#
gdb_test "tbreak main" "Breakpoint.*at.* file .*$srcfile, line.*" "Temporary breakpoint function"
gdb_test "tbreak main" "Temporary breakpoint.*at.* file .*$srcfile, line.*" "Temporary breakpoint function"
#
# test break at function in file
#
gdb_test "tbreak $srcfile:factorial" "Breakpoint.*at.* file .*$srcfile, line.*" \
gdb_test "tbreak $srcfile:factorial" "Temporary breakpoint.*at.* file .*$srcfile, line.*" \
"Temporary breakpoint function in file"
#
@ -248,7 +248,7 @@ gdb_test "tbreak $srcfile:factorial" "Breakpoint.*at.* file .*$srcfile, line.*"
#
send_gdb "tbreak $bp_location1\n"
gdb_expect {
-re "Breakpoint.*at.* file .*$srcfile, line $bp_location1.*$gdb_prompt $" {
-re "Temporary breakpoint.*at.* file .*$srcfile, line $bp_location1.*$gdb_prompt $" {
pass "Temporary breakpoint line number #1"
}
-re ".*$gdb_prompt $" {
@ -259,14 +259,14 @@ gdb_expect {
}
}
gdb_test "tbreak $bp_location6" "Breakpoint.*at.* file .*$srcfile, line $bp_location6.*" "Temporary breakpoint line number #2"
gdb_test "tbreak $bp_location6" "Temporary breakpoint.*at.* file .*$srcfile, line $bp_location6.*" "Temporary breakpoint line number #2"
#
# test break at line number in file
#
send_gdb "tbreak $srcfile:$bp_location2\n"
gdb_expect {
-re "Breakpoint.*at.* file .*$srcfile, line $bp_location2.*$gdb_prompt $" {
-re "Temporary breakpoint.*at.* file .*$srcfile, line $bp_location2.*$gdb_prompt $" {
pass "Temporary breakpoint line number in file #1"
}
-re ".*$gdb_prompt $" {
@ -278,7 +278,7 @@ gdb_expect {
}
set bp_location11 [gdb_get_line_number "set breakpoint 11 here"]
gdb_test "tbreak $srcfile:$bp_location11" "Breakpoint.*at.* file .*$srcfile, line $bp_location11.*" "Temporary breakpoint line number in file #2"
gdb_test "tbreak $srcfile:$bp_location11" "Temporary breakpoint.*at.* file .*$srcfile, line $bp_location11.*" "Temporary breakpoint line number in file #2"
#
# check to see what breakpoints are set (temporary this time)

22
gdb/testsuite/gdb.base/call-ar-st.exp
View File

@ -109,7 +109,7 @@ get_debug_format
#go -until 1209
gdb_test "tbreak 1209" \
"Breakpoint \[0-9\]+.*file.*$srcfile, line 1209.*" \
"Temporary breakpoint \[0-9\]+.*file.*$srcfile, line 1209.*" \
"tbreakpoint line 1209"
gdb_test continue \
@ -149,7 +149,7 @@ if ![gdb_skip_stdio_test "print_char_array(char_array)"] {
#go -until 1216
gdb_test "tbreak 1216" \
"Breakpoint.*file.*$srcfile, line 1216.*" \
"Temporary breakpoint.*file.*$srcfile, line 1216.*" \
"tbreakpoint line 1216"
if ![gdb_skip_stdio_test "continue to 1216"] {
@ -183,7 +183,7 @@ if ![gdb_skip_stdio_test "continue to 1216"] {
#set timeout $oldtimeout
#go -until 1220
gdb_test "tbreak 1220" \
"Breakpoint.* file .*$srcfile, line 1220.*" \
"Temporary breakpoint.* file .*$srcfile, line 1220.*" \
"tbreakpoint line 1220"
if {![gdb_skip_float_test "continuing to breakpoint 1220"] && \
@ -247,7 +247,7 @@ if {![gdb_skip_float_test "print print_double_array(array_d)"] && \
#go -until 1236
gdb_test "tbreak 1236" \
"Breakpoint.* file .*$srcfile, line 1236.*" \
"Temporary breakpoint.* file .*$srcfile, line 1236.*" \
"tbreakpoint line 1236"
if {![gdb_skip_float_test "continuing to 1236"] && \
@ -311,7 +311,7 @@ if ![gdb_skip_stdio_test "print print_array_rep(...)"] {
#go -until 1241
gdb_test "tbreak 1241" \
"Breakpoint..* file .*$srcfile, line 1241.*" \
"Temporary breakpoint..* file .*$srcfile, line 1241.*" \
"tbreakpoint line 1241"
send_gdb "continue\n"
@ -355,7 +355,7 @@ gdb_test "continue" \
#go -until 1281
gdb_test "tbreak 1281" \
"Breakpoint.* file .*call-ar-st.c, line 1281.*" \
"Temporary breakpoint.* file .*call-ar-st.c, line 1281.*" \
"tbreakpoint line 1281"
if ![gdb_skip_stdio_test "continuing to 1281"] {
@ -443,7 +443,7 @@ if {![gdb_skip_float_test "print print_ten_doubles(...)"] && \
#go -until 1286
gdb_test "tbreak 1286" \
"Breakpoint .* file .*call-ar-st.c, line 1286.*" \
"Temporary breakpoint .* file .*call-ar-st.c, line 1286.*" \
"tbreakpoint line 1286"
gdb_test continue "Continuing\\..*main \\(.*\\) at.*call-ar-st.c:1286\[\t\r\n \]+1286.*print_long_arg_list \\( a, b, c, d, e, f, .struct1, .struct2, .struct3, .struct4,.*" "continue to 1286"
@ -471,7 +471,7 @@ if { [istarget "hppa*-*-hpux*"] } {
# We can't just assume that a "step" will get us into
# print_long_arg_list here,either.
gdb_test "tbreak print_long_arg_list" \
"Breakpoint .* file .*call-ar-st.c, line .*" \
"Temporary breakpoint .* file .*call-ar-st.c, line .*" \
"tbreak in print_long_arg_list after stepping into memcpy"
# The short match case below handles cases where a buffer
# overflows or something, and expect can't deal with the full
@ -551,7 +551,7 @@ if {![gdb_skip_float_test "print_small_structs from print_long_arg_list"] && \
#go -until 1300
gdb_test "tbreak 1300" \
"Breakpoint.* file .*call-ar-st.c, line 1300.*" \
"Temporary breakpoint.* file .*call-ar-st.c, line 1300.*" \
"tbreakpoint line 1300"
if ![gdb_skip_stdio_test "continuing to 1300"] {
@ -590,7 +590,7 @@ if ![gdb_skip_stdio_test "continuing to 1300"] {
#go -until 1305
gdb_test "tbreak 1305" \
"Breakpoint.* file .*call-ar-st.c, line 1305.*" \
"Temporary breakpoint.* file .*call-ar-st.c, line 1305.*" \
"tbreakpoint line 1305"
gdb_test continue "Continuing\\..*main \\(\\) at .*call-ar-st.c:1305\[\r\n\t \]+1305.*init_int_char_combo\\(int_char_combo, 13, .!.\\);" \
@ -650,7 +650,7 @@ if {![gdb_skip_float_test "print print_long_arg_list"] && \
#go -until 1311
gdb_test "tbreak 1311" \
"Breakpoint.* file .*call-ar-st.c, line 1311.*" \
"Temporary breakpoint.* file .*call-ar-st.c, line 1311.*" \
"tbreakpoint line 1311"
gdb_test continue "Continuing\\..*main \\(\\) at .*call-ar-st.c:1311\[ \t\n\r\]+1311.*compute_with_small_structs\\(35\\);" \

2
gdb/testsuite/gdb.base/commands.exp
View File

@ -521,7 +521,7 @@ proc temporary_breakpoint_commands {} {
# This test will verify that this commands list is executed when the
# breakpoint is hit.
gdb_test "tbreak factorial" \
"Breakpoint \[0-9\]+ at .*: file .*/run.c, line \[0-9\]+\." \
"Temporary breakpoint \[0-9\]+ at .*: file .*/run.c, line \[0-9\]+\." \
"breakpoint in temporary_breakpoint_commands"
send_gdb "commands\n"

2
gdb/testsuite/gdb.base/display.exp
View File

@ -165,7 +165,7 @@ gdb_expect {
}
gdb_test "step" ".*do_vars.*.*27.*"
gdb_test "tbreak 37" ".*Breakpoint 5 a.*"
gdb_test "tbreak 37" ".*breakpoint 5 a.*"
gdb_test "cont" ".*do_vars.*37.*37.*"
# Beat on printf a bit

4
gdb/testsuite/gdb.base/foll-exec.exp
View File

@ -283,7 +283,7 @@ proc do_exec_tests {} {
#
send_gdb "tbreak 27\n"
gdb_expect {
-re "Breakpoint .*file .*${srcfile}, line 27.*$gdb_prompt $"\
-re "Temporary breakpoint .*file .*${srcfile}, line 27.*$gdb_prompt $"\
{pass "prepare to jump to execl call"}
-re "$gdb_prompt $" {fail "prepare to jump to execl call"}
timeout {fail "(timeout) prepare to jump to execl call"}
@ -343,7 +343,7 @@ proc do_exec_tests {} {
#
send_gdb "tbreak 41\n"
gdb_expect {
-re "Breakpoint .*file .*${srcfile}, line 41.*$gdb_prompt $"\
-re "Temporary breakpoint .*file .*${srcfile}, line 41.*$gdb_prompt $"\
{pass "prepare to jump to execv call"}
-re "$gdb_prompt $" {fail "prepare to jump to execv call"}
timeout {fail "(timeout) prepare to jump to execv call"}

4
gdb/testsuite/gdb.base/foll-fork.exp
View File

@ -194,7 +194,7 @@ proc catch_fork_child_follow {} {
}
send_gdb "tbreak ${srcfile}:24\n"
gdb_expect {
-re "Breakpoint.*, line 24.*$gdb_prompt $"\
-re "Temporary breakpoint.*, line 24.*$gdb_prompt $"\
{pass "set follow child, tbreak"}
-re "$gdb_prompt $" {fail "set follow child, tbreak"}
timeout {fail "(timeout) set follow child, tbreak"}
@ -255,7 +255,7 @@ proc tcatch_fork_parent_follow {} {
}
send_gdb "tbreak ${srcfile}:24\n"
gdb_expect {
-re "Breakpoint.*, line 24.*$gdb_prompt $"\
-re "Temporary breakpoint.*, line 24.*$gdb_prompt $"\
{pass "set follow parent, tbreak"}
-re "$gdb_prompt $" {fail "set follow parent, tbreak"}
timeout {fail "(timeout) set follow child, tbreak"}

4
gdb/testsuite/gdb.base/restore.exp
View File

@ -54,7 +54,7 @@ proc restore_tests { } {
for {set c 1} {$c <= $limit} {incr c} {
# Set a breakpoint at the next caller function.
gdb_test "tbreak caller$c" "Breakpoint.*\[0-9\]*\\." \
gdb_test "tbreak caller$c" "Temporary breakpoint.*\[0-9\]*\\." \
"tbreak caller$c"
# Continue to the next caller function.
@ -63,7 +63,7 @@ proc restore_tests { } {
# Do each callee function.
for {set e 1} {$e <= $limit} {incr e} {
gdb_test "tbreak callee$e" "Breakpoint.*\[0-9\]*\\." \
gdb_test "tbreak callee$e" "Temporary breakpoint.*\[0-9\]*\\." \
"caller$c calls callee$e; tbreak callee"
gdb_test "continue" " callee$e prologue .*/" \

12
gdb/testsuite/gdb.base/sepdebug.exp
View File

@ -261,13 +261,13 @@ delete_breakpoints
# test temporary breakpoint at function
#
gdb_test "tbreak main" "Breakpoint.*at.* file .*$srcfile, line.*" "Temporary breakpoint function"
gdb_test "tbreak main" "Temporary breakpoint.*at.* file .*$srcfile, line.*" "Temporary breakpoint function"
#
# test break at function in file
#
gdb_test "tbreak $srcfile:factorial" "Breakpoint.*at.* file .*$srcfile, line.*" \
gdb_test "tbreak $srcfile:factorial" "Temporary breakpoint.*at.* file .*$srcfile, line.*" \
"Temporary breakpoint function in file"
#
@ -275,25 +275,25 @@ gdb_test "tbreak $srcfile:factorial" "Breakpoint.*at.* file .*$srcfile, line.*"
#
send_gdb "tbreak $bp_location1\n"
gdb_expect {
-re "Breakpoint.*at.* file .*$srcfile, line $bp_location1.*$gdb_prompt $" { pass "Temporary breakpoint line number #1" }
-re "Temporary breakpoint.*at.* file .*$srcfile, line $bp_location1.*$gdb_prompt $" { pass "Temporary breakpoint line number #1" }
-re ".*$gdb_prompt $" { pass "Temporary breakpoint line number #1" }
timeout { fail "breakpoint line number #1 (timeout)" }
}
gdb_test "tbreak $bp_location6" "Breakpoint.*at.* file .*$srcfile, line $bp_location6.*" "Temporary breakpoint line number #2"
gdb_test "tbreak $bp_location6" "Temporary breakpoint.*at.* file .*$srcfile, line $bp_location6.*" "Temporary breakpoint line number #2"
#
# test break at line number in file
#
send_gdb "tbreak $srcfile:$bp_location2\n"
gdb_expect {
-re "Breakpoint.*at.* file .*$srcfile, line $bp_location2.*$gdb_prompt $" { pass "Temporary breakpoint line number in file #1" }
-re "Temporary breakpoint.*at.* file .*$srcfile, line $bp_location2.*$gdb_prompt $" { pass "Temporary breakpoint line number in file #1" }
-re ".*$gdb_prompt $" { pass "Temporary breakpoint line number in file #1" }
timeout { fail "Temporary breakpoint line number in file #1 (timeout)" }
}
set bp_location11 [gdb_get_line_number "set breakpoint 11 here"]
gdb_test "tbreak $srcfile:$bp_location11" "Breakpoint.*at.* file .*$srcfile, line $bp_location11.*" "Temporary breakpoint line number in file #2"
gdb_test "tbreak $srcfile:$bp_location11" "Temporary breakpoint.*at.* file .*$srcfile, line $bp_location11.*" "Temporary breakpoint line number in file #2"
#
# check to see what breakpoints are set (temporary this time)

2
gdb/testsuite/gdb.base/watchpoint.exp
View File

@ -606,7 +606,7 @@ proc test_complex_watchpoint {} {
# local to a recursing function should be bound only to that
# one invocation, and should not trigger for other invocations.
#
gdb_test "tbreak recurser" ".*Breakpoint.*"
gdb_test "tbreak recurser" ".*breakpoint.*"
gdb_test "cont" "Continuing.*recurser.*"
gdb_test "watch local_x" ".*\[Ww\]atchpoint \[0-9\]*: local_x" \
"set local watch in recursive call"

7
gdb/testsuite/gdb.mi/mi-cli.exp
View File

@ -96,8 +96,8 @@ mi_gdb_test "-interpreter-exec console \"list\"" \
".*\~\"$line_main_body\[\\\\t \]*callee1.*;\\\\n\".*\\^done" \
"-interpreter-exec console \"list\""
mi_execute_to "exec-continue" "breakpoint-hit" "callee4" "" ".*basics.c" "27" "" \
"continue to callee4"
mi_execute_to "exec-continue" "breakpoint-hit" "callee4" "" ".*basics.c" "27" \
{ "" "disp=\"keep\"" } "continue to callee4"
# NOTE: cagney/2003-02-03: Not yet.
# mi_gdb_test "100-interpreter-exec console \"delete 2\"" \
@ -147,7 +147,8 @@ mi_gdb_test "600-break-insert -t basics.c:$line_main_hello" \
{600\^done,bkpt=.number="3",type="breakpoint".*\}} \
"-break-insert -t basics.c:\$line_main_hello"
mi_execute_to "exec-continue" "" "main" "" ".*basics.c" $line_main_hello "" \
mi_execute_to "exec-continue" "breakpoint-hit" "main" "" ".*basics.c" \
$line_main_hello { "" "disp=\"del\"" } \
"-exec-continue to line $line_main_hello"
mi_execute_to "exec-next" "end-stepping-range" "main" "" ".*basics.c" $line_main_return "" \

5
gdb/testsuite/gdb.mi/mi-pending.exp
View File

@ -68,5 +68,6 @@ mi_gdb_test "-break-insert -f pendfunc1" \
"MI pending breakpoint on pendfunc1"
mi_run_cmd
mi_expect_stop "breakpoint-hit" "pendfunc1" ".*" ".*" ".*" "" \
"Run till MI pending breakpoint on pendfunc1"
mi_expect_stop "breakpoint-hit" "pendfunc1" ".*" ".*" ".*" \
{ "" "disp=\"keep\"" } \
"Run till MI pending breakpoint on pendfunc1"

3
gdb/testsuite/gdb.mi/mi-simplerun.exp
View File

@ -113,7 +113,8 @@ proc test_running_the_program {} {
# two prompts involved and this can lead to a race condition.
# The following is equivalent to a send_gdb "000-exec-run\n"
mi_run_cmd
mi_expect_stop "breakpoint-hit" "main" "" ".*basics.c" "$line_main_body" "" "run to main"
mi_expect_stop "breakpoint-hit" "main" "" ".*basics.c" "$line_main_body" \
{ "" "disp=\"keep\"" } "run to main"
}
proc test_controlled_execution {} {

3
gdb/testsuite/gdb.mi/mi-until.exp
View File

@ -55,7 +55,8 @@ proc test_running_to_foo {} {
"break-insert operation"
mi_run_cmd
mi_expect_stop "breakpoint-hit" "foo" "" ".*until.c" 10 "" "run to main"
mi_expect_stop "breakpoint-hit" "foo" "" ".*until.c" 10 \
{ "" "disp=\"keep\"" } "run to main"
mi_gdb_test "100-break-delete 1" "100\\^done" "break-delete 1"

3
gdb/testsuite/gdb.mi/mi-var-cmd.exp
View File

@ -581,7 +581,8 @@ mi_run_inline_test floating
set do_at_tests_callee_breakpoint [gdb_get_line_number "breakpoint inside callee"]
mi_gdb_test "-break-insert var-cmd.c:$do_at_tests_callee_breakpoint" ".*" \
"inside breakpoint inside callee"
mi_execute_to "exec-continue" "breakpoint-hit" do_at_tests_callee "" ".*" ".*" ""\
mi_execute_to "exec-continue" "breakpoint-hit" do_at_tests_callee "" ".*" ".*" \
{ "" "disp=\"keep\"" } \
"continue to where i is initialized"
mi_varobj_update F {F} "update F inside callee"

6
gdb/testsuite/gdb.mi/mi-var-display.exp
View File

@ -47,7 +47,8 @@ mi_gdb_test "200-break-insert $srcfile:$line_dct_end" \
"break-insert operation"
mi_run_cmd
mi_expect_stop "breakpoint-hit" "do_children_tests" "" ".*var-cmd.c" $line_dct_end "" "run to main"
mi_expect_stop "breakpoint-hit" "do_children_tests" "" ".*var-cmd.c" \
$line_dct_end { "" "disp=\"keep\"" } "run to main"
##### #####
# #
@ -374,7 +375,8 @@ mi_gdb_test "200-break-insert $line_dst_incr_a_2" \
"200\\^done,bkpt=\{number=\"2\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"do_special_tests\",file=\".*var-cmd.c\",line=\"$line_dst_incr_a_2\",times=\"0\"\}" \
"break-insert operation"
mi_execute_to "exec-continue" "breakpoint-hit" "do_special_tests" "" ".*var-cmd.c" $line_dst_incr_a_2 "" \
mi_execute_to "exec-continue" "breakpoint-hit" "do_special_tests" "" \
".*var-cmd.c" $line_dst_incr_a_2 { "" "disp=\"keep\"" } \
"continue to do_special_tests"
# Test: c_variable-7.10

6
gdb/testsuite/gdb.mi/mi2-cli.exp
View File

@ -96,7 +96,8 @@ mi_gdb_test "-interpreter-exec console \"list\"" \
".*\~\"$line_main_body\[\\\\t \]*callee1.*;\\\\n\".*\\^done" \
"-interpreter-exec console \"list\""
mi_execute_to "exec-continue" "breakpoint-hit" "callee4" "" ".*basics.c" "27" "" \
mi_execute_to "exec-continue" "breakpoint-hit" "callee4" "" ".*basics.c" "27" \
{ "" "disp=\"keep\"" } \
"continue to callee4"
# NOTE: cagney/2003-02-03: Not yet.
@ -147,7 +148,8 @@ mi_gdb_test "600-break-insert -t basics.c:$line_main_hello" \
{600\^done,bkpt=.number="3",type="breakpoint".*\}} \
"-break-insert -t basics.c:\$line_main_hello"
mi_execute_to "exec-continue" "" "main" "" ".*basics.c" $line_main_hello "" \
mi_execute_to "exec-continue" "breakpoint-hit" "main" "" ".*basics.c" \
$line_main_hello { "" "disp=\"del\"" } \
"-exec-continue to line $line_main_hello"
mi_execute_to "exec-next" "end-stepping-range" "main" "" ".*basics.c" $line_main_return "" \

3
gdb/testsuite/gdb.mi/mi2-simplerun.exp
View File

@ -113,7 +113,8 @@ proc test_running_the_program {} {
# two prompts involved and this can lead to a race condition.
# The following is equivalent to a send_gdb "000-exec-run\n"
mi_run_cmd
mi_expect_stop "breakpoint-hit" "main" "" ".*basics.c" "$line_main_body" "" "run to main"
mi_expect_stop "breakpoint-hit" "main" "" ".*basics.c" "$line_main_body" \
{"" "disp=\"keep\"" } "run to main"
}
proc test_controlled_execution {} {

3
gdb/testsuite/gdb.mi/mi2-until.exp
View File

@ -56,7 +56,8 @@ proc test_running_to_foo {} {
"break-insert operation"
mi_run_cmd
mi_expect_stop "breakpoint-hit" "foo" "" ".*until.c" 10 "" "run to main"
mi_expect_stop "breakpoint-hit" "foo" "" ".*until.c" 10 \
{ "" "disp=\"keep\"" } "run to main"
mi_gdb_test "100-break-delete 1" "100\\^done" "break-delete 1"

6
gdb/testsuite/gdb.mi/mi2-var-display.exp
View File

@ -47,7 +47,8 @@ mi_gdb_test "200-break-insert $srcfile:$line_dct_end" \
"break-insert operation"
mi_run_cmd
mi_expect_stop "breakpoint-hit" "do_children_tests" "" ".*var-cmd.c" $line_dct_end "" "run to main"
mi_expect_stop "breakpoint-hit" "do_children_tests" "" ".*var-cmd.c" \
$line_dct_end { "" "disp=\"keep\"" } "run to main"
##### #####
# #
@ -373,7 +374,8 @@ mi_gdb_test "200-break-insert $line_dst_incr_a_2" \
"200\\^done,bkpt=\{number=\"2\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"do_special_tests\",file=\".*var-cmd.c\",line=\"$line_dst_incr_a_2\",times=\"0\"\}" \
"break-insert operation"
mi_execute_to "exec-continue" "breakpoint-hit" "do_special_tests" "" ".*var-cmd.c" $line_dst_incr_a_2 "" \
mi_execute_to "exec-continue" "breakpoint-hit" "do_special_tests" "" \
".*var-cmd.c" $line_dst_incr_a_2 { "" "disp=\"keep\"" } \
"continue to do_special_tests"
# Test: c_variable-7.10

10
gdb/testsuite/lib/gdb.exp
View File

@ -337,17 +337,19 @@ proc gdb_breakpoint { function args } {
}
set break_command "break"
set break_message "Breakpoint"
if {[lsearch -exact [lindex $args 0] temporary] != -1} {
set break_command "tbreak"
set break_message "Temporary breakpoint"
}
send_gdb "$break_command $function\n"
# The first two regexps are what we get with -g, the third is without -g.
gdb_expect 30 {
-re "Breakpoint \[0-9\]* at .*: file .*, line $decimal.\r\n$gdb_prompt $" {}
-re "Breakpoint \[0-9\]*: file .*, line $decimal.\r\n$gdb_prompt $" {}
-re "Breakpoint \[0-9\]* at .*$gdb_prompt $" {}
-re "Breakpoint \[0-9\]* \\(.*\\) pending.*$gdb_prompt $" {
-re "$break_message \[0-9\]* at .*: file .*, line $decimal.\r\n$gdb_prompt $" {}
-re "$break_message \[0-9\]*: file .*, line $decimal.\r\n$gdb_prompt $" {}
-re "$break_message \[0-9\]* at .*$gdb_prompt $" {}
-re "$break_message \[0-9\]* \\(.*\\) pending.*$gdb_prompt $" {
if {$pending_response == "n"} {
fail "setting breakpoint at $function"
return 0

11
gdb/testsuite/lib/mi-support.exp
View File

@ -889,7 +889,7 @@ proc mi_runto_helper {func run_or_continue} {
mi_send_resuming_command "exec-continue" "$test"
}
mi_expect_stop "" $func ".*" ".*" "\[0-9\]+" "" $test
mi_expect_stop "breakpoint-hit" $func ".*" ".*" "\[0-9\]+" { "" "disp=\"del\"" } $test
}
proc mi_runto {func} {
@ -970,13 +970,16 @@ proc mi_expect_stop { reason func args file line extra test } {
set r "reason=\"$reason\","
}
verbose -log "mi_expect_stop: expecting: .*220\\*stopped,${r}${bn}${after_reason}thread-id=\"$decimal\",frame=\{addr=\"$hex\",func=\"$func\",args=$args,file=\".*$file\",fullname=\"${fullname_syntax}$file\",line=\"$line\"\}$after_stopped\r\n$mi_gdb_prompt$"
set a $after_reason
verbose -log "mi_expect_stop: expecting: .*220\\*stopped,${r}${a}${bn}thread-id=\"$decimal\",frame=\{addr=\"$hex\",func=\"$func\",args=$args,file=\".*$file\",fullname=\"${fullname_syntax}$file\",line=\"$line\"\}$after_stopped\r\n$mi_gdb_prompt$"
gdb_expect {
-re ".*220\\*stopped,${r}${bn}${after_reason}thread-id=\"$decimal\",frame=\{addr=\"$hex\",func=\"$func\",args=$args,file=\".*$file\",fullname=\"${fullname_syntax}$file\",line=\"($line)\"\}$after_stopped\r\n$mi_gdb_prompt$" {
-re ".*220\\*stopped,${r}${a}${bn}thread-id=\"$decimal\",frame=\{addr=\"$hex\",func=\"$func\",args=$args,file=\".*$file\",fullname=\"${fullname_syntax}$file\",line=\"($line)\"\}$after_stopped\r\n$mi_gdb_prompt$" {
pass "$test"
return $expect_out(2,string)
}
-re ".*220\\*stopped,${r}${bn}${after_reason}thread-id=\"$decimal\",frame=\{addr=\"$hex\",func=\".*\",args=\[\\\[\{\].*\[\\\]\}\],file=\".*\",fullname=\"${fullname_syntax}.*\",line=\"\[0-9\]*\"\}.*\r\n$mi_gdb_prompt$" {
-re ".*220\\*stopped,${r}${a}${bn}thread-id=\"$decimal\",frame=\{addr=\"$hex\",func=\".*\",args=\[\\\[\{\].*\[\\\]\}\],file=\".*\",fullname=\"${fullname_syntax}.*\",line=\"\[0-9\]*\"\}.*\r\n$mi_gdb_prompt$" {
fail "$test (stopped at wrong place)"
return -1
}