diff options
| author | Thiago Jung Bauermann <bauerman@br.ibm.com> | 2011-04-13 18:32:25 +0000 |
|---|---|---|
| committer | Thiago Jung Bauermann <bauerman@br.ibm.com> | 2011-04-13 18:32:25 +0000 |
| commit | 4a4106caaff24e972f758975ce2d3b8eb257aaff (patch) | |
| tree | 659f2352faf2cb8f3597b1dc70838c184e591df4 | |
| parent | 26063d4963d175aad03043fbf637f4ed18288bfd (diff) | |
| download | gdb-4a4106caaff24e972f758975ce2d3b8eb257aaff.zip gdb-4a4106caaff24e972f758975ce2d3b8eb257aaff.tar.gz gdb-4a4106caaff24e972f758975ce2d3b8eb257aaff.tar.bz2 | |
gdb/
* breakpoint.c (watch_command_1): Remove colon from exp_string.
gdb/testsuite/
* gdb.base/watchpoint.exp (test_inaccessible_watchpoint): Don't
expect a colon in watch -location output.
| -rw-r--r-- | gdb/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/breakpoint.c | 2 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/watchpoint.exp | 2 |
4 files changed, 11 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 994ec96..fe6bd5a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,9 @@ 2011-04-13 Thiago Jung Bauermann <bauerman@br.ibm.com> + * breakpoint.c (watch_command_1): Remove colon from exp_string. + +2011-04-13 Thiago Jung Bauermann <bauerman@br.ibm.com> + * breakpoint.c (save_breakpoints): Verify whether breakpoint_ops.print_recreate is defined before calling it. diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 5633f15..9225d15 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -9019,7 +9019,7 @@ watch_command_1 (char *arg, int accessflag, int from_tty, core_addr_to_string (addr)); xfree (name); - b->exp_string = xstrprintf ("-location: %.*s", + b->exp_string = xstrprintf ("-location %.*s", (int) (exp_end - exp_start), exp_start); /* The above expression is in C. */ diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 7a11f53..4b4dddc 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-04-13 Thiago Jung Bauermann <bauerman@br.ibm.com> + + * gdb.base/watchpoint.exp (test_inaccessible_watchpoint): Don't + expect a colon in watch -location output. + 2011-04-13 Marek Polacek <mpolacek@redhat.com> * gdb.base/commands.exp (redefine_backtrace_test): Fix race. diff --git a/gdb/testsuite/gdb.base/watchpoint.exp b/gdb/testsuite/gdb.base/watchpoint.exp index 7450602..1d8c5bc 100644 --- a/gdb/testsuite/gdb.base/watchpoint.exp +++ b/gdb/testsuite/gdb.base/watchpoint.exp @@ -685,7 +685,7 @@ proc test_inaccessible_watchpoint {} { # The same, but using -location through an indirection. gdb_test "watch -location *global_ptr" \ - "$watchpoint_msg \[0-9\]+: \-location: \\*global_ptr" + "$watchpoint_msg \[0-9\]+: \-location \\*global_ptr" delete_breakpoints # This step requires two HW watchpoints. Since some platforms only |