diff options
| author | Stan Shebs <shebs@codesourcery.com> | 2010-04-04 23:47:16 +0000 |
|---|---|---|
| committer | Stan Shebs <shebs@codesourcery.com> | 2010-04-04 23:47:16 +0000 |
| commit | d77f58beee3dbdfc260b5cf672a565f686b996f7 (patch) | |
| tree | d307edb50ef42809632c983fb88a566d936fed99 /gdb/testsuite/gdb.base/watchpoint.exp | |
| parent | af54718eaed854c5e7ef4dbd6845969aa6558ef4 (diff) | |
| download | gdb-d77f58beee3dbdfc260b5cf672a565f686b996f7.zip gdb-d77f58beee3dbdfc260b5cf672a565f686b996f7.tar.gz gdb-d77f58beee3dbdfc260b5cf672a565f686b996f7.tar.bz2 | |
2010-04-04 Stan Shebs <stan@codesourcery.com>
Nathan Sidwell <nathan@codesourcery.com>
* breakpoint.c (breakpoint_1): Add filter argument, return number of
breakpoints printed.
(is_hardware_watchpoint): Make argument const.
(is_watchpoint): Ditto.
(is_tracepoint): Merge of tracepoint_type and breakpoint_is_tracepoint,
use it everywhere.
(breakpoints_info): Pass NULL to breakpoint_1.
(maintenance_info_breakpoints): Ditto.
(watchpoints_info): New function.
(tracepoints_info): Use breakpoint_1 filter.
(set_ignore_count): Warn that tracepoint ignore count will be ignored.
(_initialize_breakpoint): Make "info watchpoints" its own command.
* breakpoint.h (is_tracepoint): Rename from breakpoint_is_tracepoint.
* mi/mi-cmd-break.c (mi_cmd_break_commands): Use is_tracepoint.
* gdb.texinfo (Setting Breakpoints): "info watch" no longer a synonym.
(Setting Watchpoints): Update description of "info watch".
(Disabling Breakpoints): Only "info break" lists all.
* gdb.base/completion.exp: Update for new "info watchpoints".
* gdb.base/default.exp: Ditto.
* gdb.base/help.exp: Ditto.
* gdb.base/watchpoint.exp: Ditto.
* gdb.trace/infotrace.exp: Update "info tracpoints" output.
Diffstat (limited to 'gdb/testsuite/gdb.base/watchpoint.exp')
| -rw-r--r-- | gdb/testsuite/gdb.base/watchpoint.exp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/gdb/testsuite/gdb.base/watchpoint.exp b/gdb/testsuite/gdb.base/watchpoint.exp index 7de577b..968998f 100644 --- a/gdb/testsuite/gdb.base/watchpoint.exp +++ b/gdb/testsuite/gdb.base/watchpoint.exp @@ -102,9 +102,7 @@ proc initialize {} { } } - # "info watch" is the same as "info break" - - if [gdb_test "info watch" "1\[ \]*breakpoint.*marker1.*\r\n2\[ \]*breakpoint.*marker2.*\r\n3\[ \]*.*watchpoint.*ival3" "watchpoint found in watchpoint/breakpoint table" ] { + if [gdb_test "info watch" "3\[ \]*.*watchpoint.*ival3" "watchpoint found in watchpoint/breakpoint table" ] { return 0; } @@ -176,11 +174,9 @@ proc test_simple_watchpoint {} { set wp_set 1 - # "info watch" is the same as "info break" - send_gdb "info watch\n" gdb_expect { - -re "1\[ \]*breakpoint.*marker1.*\r\n2\[ \]*breakpoint.*marker2.*\r\n3\[ \]*.*watchpoint.*ival3\r\n$gdb_prompt $" { + -re "3\[ \]*.*watchpoint.*ival3\r\n$gdb_prompt $" { pass "watchpoint found in watchpoint/breakpoint table" } -re ".*$gdb_prompt $" { @@ -297,7 +293,7 @@ proc test_disabling_watchpoints {} { global hex # "info watch" is the same as "info break" - gdb_test "info watch" "\[0-9\]+\[ \]*breakpoint.*marker1.*\r\n\[0-9\]+\[ \]*breakpoint.*marker2.*\r\n\[0-9]+\[ \]*.*watchpoint.*ival3\r\n\.*\[0-9\]+ times.*" "watchpoints found in watchpoint/breakpoint table" + gdb_test "info watch" "\[0-9]+\[ \]*.*watchpoint.*ival3\r\n\.*\[0-9\]+ times.*" "watchpoints found in watchpoint/breakpoint table" # Ensure that the watchpoint is disabled when we startup. |