If a breakpoint is not user visible, then there's no point in
bothering the frontend about it... This is the exact same check MI does. I also smoke tested Emacs 23 in gud-gdb mode, both annotations=2 and annotations=3. I didn't notice anything break. gdb/ 2013-01-22 Pedro Alves <palves@redhat.com> * annotate.c (breakpoint_changed): Skip if breakpoint is not user-visible. gdb/testsuite/ 2013-01-22 Pedro Alves <palves@redhat.com> * gdb.base/annota1.exp (signal sent): No longer expect breakpoints-invalid. * gdb.cp/annota2.exp (continue until exit) (watch triggered on a.x): Ditto.
This commit is contained in:
parent
9c97429fb1
commit
0928e93dfd
5 changed files with 19 additions and 4 deletions
|
@ -1,3 +1,8 @@
|
|||
2013-01-22 Pedro Alves <palves@redhat.com>
|
||||
|
||||
* annotate.c (breakpoint_changed): Skip if breakpoint is not
|
||||
user-visible.
|
||||
|
||||
2013-01-22 Pedro Alves <palves@redhat.com>
|
||||
|
||||
* annotate.c (annotate_breakpoints_changed): Rename to ...
|
||||
|
|
|
@ -575,6 +575,9 @@ annotate_display_prompt (void)
|
|||
static void
|
||||
breakpoint_changed (struct breakpoint *b)
|
||||
{
|
||||
if (b->number <= 0)
|
||||
return;
|
||||
|
||||
annotate_breakpoints_invalid ();
|
||||
}
|
||||
|
||||
|
|
|
@ -1,3 +1,10 @@
|
|||
2013-01-22 Pedro Alves <palves@redhat.com>
|
||||
|
||||
* gdb.base/annota1.exp (signal sent): No longer expect
|
||||
breakpoints-invalid.
|
||||
* gdb.cp/annota2.exp (continue until exit)
|
||||
(watch triggered on a.x): Ditto.
|
||||
|
||||
2013-01-22 Pedro Alves <palves@redhat.com>
|
||||
|
||||
* gdb.base/annota1.exp (breakpoints_invalid): New variable.
|
||||
|
|
|
@ -425,7 +425,7 @@ if [target_info exists gdb,nosignals] {
|
|||
} else {
|
||||
setup_xfail hppa*-*-hpux11*
|
||||
gdb_test_multiple "signal SIGTRAP" "signal sent" {
|
||||
-re ".*\032\032post-prompt\r\nContinuing with signal SIGTRAP.\r\n\r\n\032\032starting\(\r\n\r\n\032\032frames-invalid\)+\r\n\r\n\032\032signalled\r\n\r\nProgram terminated with signal \r\n\032\032signal-name\r\nSIGTRAP\r\n\032\032signal-name-end\r\n, \r\n\032\032signal-string\r\nTrace.breakpoint trap\r\n\032\032signal-string-end\r\n.\r\nThe program no longer exists.\r\n${breakpoints_invalid}\r\n\032\032stopped\r\n$gdb_prompt$" {
|
||||
-re ".*\032\032post-prompt\r\nContinuing with signal SIGTRAP.\r\n\r\n\032\032starting\(\r\n\r\n\032\032frames-invalid\)+\r\n\r\n\032\032signalled\r\n\r\nProgram terminated with signal \r\n\032\032signal-name\r\nSIGTRAP\r\n\032\032signal-name-end\r\n, \r\n\032\032signal-string\r\nTrace.breakpoint trap\r\n\032\032signal-string-end\r\n.\r\nThe program no longer exists.\r\n\r\n\032\032stopped\r\n$gdb_prompt$" {
|
||||
pass "signal sent"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -102,7 +102,7 @@ gdb_test_multiple "print a" "print class" {
|
|||
# `a.x is 1' is asynchronous regarding to `frames-invalid'.
|
||||
#
|
||||
gdb_test_multiple "continue" "continue until exit" {
|
||||
-re "\r\n\032\032post-prompt\r\nContinuing.\r\n\r\n\032\032starting\(\r\n\r\n\032\032frames-invalid\)*\r\na.x is 1\r\n\(\r\n\032\032frames-invalid\r\n\)*\r\n\032\032exited 0\r\n$inferior_exited_re normally.\r\n${breakpoints_invalid}\r\n\032\032stopped\r\n$gdb_prompt$" {
|
||||
-re "\r\n\032\032post-prompt\r\nContinuing.\r\n\r\n\032\032starting\(\r\n\r\n\032\032frames-invalid\)*\r\na.x is 1\r\n\(\r\n\032\032frames-invalid\r\n\)*\r\n\032\032exited 0\r\n$inferior_exited_re normally.\r\n\r\n\032\032stopped\r\n$gdb_prompt$" {
|
||||
pass "continue until exit"
|
||||
}
|
||||
}
|
||||
|
@ -162,10 +162,10 @@ gdb_test_multiple "watch a.x" "set watch on a.x" {
|
|||
# annotate-watchpoint
|
||||
#
|
||||
gdb_test_multiple "next" "watch triggered on a.x" {
|
||||
-re "\r\n\032\032post-prompt\r\n\032\032starting\r\n${frames_invalid}${breakpoints_invalid}\r\n\032\032watchpoint 3\r\n.*atchpoint 3: a.x\r\n\r\nOld value = 0\r\nNew value = 1\r\n\r\n\032\032frame-begin 0 $hex\r\n\r\n\032\032frame-function-name\r\nmain\r\n\032\032frame-args\r\n \\(\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n.*$srcfile\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n$decimal\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032source .*$srcfile.*beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped\r\n${breakpoints_invalid}.*$gdb_prompt$" {
|
||||
-re "\r\n\032\032post-prompt\r\n\032\032starting\r\n${frames_invalid}${breakpoints_invalid}\r\n\032\032watchpoint 3\r\n.*atchpoint 3: a.x\r\n\r\nOld value = 0\r\nNew value = 1\r\n\r\n\032\032frame-begin 0 $hex\r\n\r\n\032\032frame-function-name\r\nmain\r\n\032\032frame-args\r\n \\(\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n.*$srcfile\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n$decimal\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032source .*$srcfile.*beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped\r\n.*$gdb_prompt$" {
|
||||
pass "watch triggered on a.x"
|
||||
}
|
||||
-re "\r\n\032\032post-prompt\r\n\r\n\032\032starting\r\n${frames_invalid}\r\n\032\032source .*$srcfile.*beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped\r\n${breakpoints_invalid}$gdb_prompt$" {
|
||||
-re "\r\n\032\032post-prompt\r\n\r\n\032\032starting\r\n${frames_invalid}\r\n\032\032source .*$srcfile.*beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped\r\n$gdb_prompt$" {
|
||||
kfail "gdb/38" "watch triggered on a.x"
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue