* gdb.base/gdb1250.exp: Use runto {allow-pending}.
* lib/gdb.exp (runto, gdb_breakpoint): Support {allow-pending}.
This commit is contained in:
parent
920e341964
commit
78a1a89446
|
@ -1,3 +1,8 @@
|
||||||
|
2004-03-24 Daniel Jacobowitz <drow@mvista.com>
|
||||||
|
|
||||||
|
* gdb.base/gdb1250.exp: Use runto {allow-pending}.
|
||||||
|
* lib/gdb.exp (runto, gdb_breakpoint): Support {allow-pending}.
|
||||||
|
|
||||||
2004-03-22 Andrew Cagney <cagney@redhat.com>
|
2004-03-22 Andrew Cagney <cagney@redhat.com>
|
||||||
|
|
||||||
* gdb.base/watchpoint.exp (test_stepping): Delete bogus XFAILs
|
* gdb.base/watchpoint.exp (test_stepping): Delete bogus XFAILs
|
||||||
|
|
|
@ -42,7 +42,7 @@ gdb_start
|
||||||
gdb_reinitialize_dir $srcdir/$subdir
|
gdb_reinitialize_dir $srcdir/$subdir
|
||||||
gdb_load ${binfile}
|
gdb_load ${binfile}
|
||||||
|
|
||||||
if ![runto abort] then {
|
if ![runto abort {allow-pending}] then {
|
||||||
perror "couldn't run to breakpoint"
|
perror "couldn't run to breakpoint"
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
|
@ -265,18 +265,32 @@ proc gdb_run_cmd {args} {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
proc gdb_breakpoint { function } {
|
# Set a breakpoint at FUNCTION. If there is an additional argument it is
|
||||||
|
# a list of options; the only currently supported option is allow-pending.
|
||||||
|
|
||||||
|
proc gdb_breakpoint { function args } {
|
||||||
global gdb_prompt
|
global gdb_prompt
|
||||||
global decimal
|
global decimal
|
||||||
|
|
||||||
|
set pending_response n
|
||||||
|
if {[lsearch -exact [lindex $args 0] allow-pending] != -1} {
|
||||||
|
set pending_response y
|
||||||
|
}
|
||||||
|
|
||||||
send_gdb "break $function\n"
|
send_gdb "break $function\n"
|
||||||
# The first two regexps are what we get with -g, the third is without -g.
|
# The first two regexps are what we get with -g, the third is without -g.
|
||||||
gdb_expect 30 {
|
gdb_expect 30 {
|
||||||
-re "Breakpoint \[0-9\]* at .*: file .*, line $decimal.\r\n$gdb_prompt $" {}
|
-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\]*: file .*, line $decimal.\r\n$gdb_prompt $" {}
|
||||||
-re "Breakpoint \[0-9\]* at .*$gdb_prompt $" {}
|
-re "Breakpoint \[0-9\]* at .*$gdb_prompt $" {}
|
||||||
|
-re "Breakpoint \[0-9\]* \\(.*\\) pending.*$gdb_prompt $" {
|
||||||
|
if {$pending_response == "n"} {
|
||||||
|
fail "setting breakpoint at $function"
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
}
|
||||||
-re "Make breakpoint pending.*y or \\\[n\\\]. $" {
|
-re "Make breakpoint pending.*y or \\\[n\\\]. $" {
|
||||||
send_gdb "n\n"
|
send_gdb "$pending_response\n"
|
||||||
exp_continue
|
exp_continue
|
||||||
}
|
}
|
||||||
-re "$gdb_prompt $" { fail "setting breakpoint at $function" ; return 0 }
|
-re "$gdb_prompt $" { fail "setting breakpoint at $function" ; return 0 }
|
||||||
|
@ -289,15 +303,16 @@ proc gdb_breakpoint { function } {
|
||||||
# Since this is the only breakpoint that will be set, if it stops
|
# Since this is the only breakpoint that will be set, if it stops
|
||||||
# at a breakpoint, we will assume it is the one we want. We can't
|
# at a breakpoint, we will assume it is the one we want. We can't
|
||||||
# just compare to "function" because it might be a fully qualified,
|
# just compare to "function" because it might be a fully qualified,
|
||||||
# single quoted C++ function specifier.
|
# single quoted C++ function specifier. If there's an additional argument,
|
||||||
|
# pass it to gdb_breakpoint.
|
||||||
|
|
||||||
proc runto { function } {
|
proc runto { function args } {
|
||||||
global gdb_prompt
|
global gdb_prompt
|
||||||
global decimal
|
global decimal
|
||||||
|
|
||||||
delete_breakpoints
|
delete_breakpoints
|
||||||
|
|
||||||
if ![gdb_breakpoint $function] {
|
if ![gdb_breakpoint $function [lindex $args 0]] {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue