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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ab24e93cc8639465a6e58a113cf6c063e30c4cf5..a8ce0f454797c35d4527d81dca14b8007422e582 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-15  Thiago Jung Bauermann  <bauerman@br.ibm.com>
+
+       * breakpoint.c (watch_command_1): Remove colon from exp_string.
+
 2011-04-15  Thiago Jung Bauermann  <bauerman@br.ibm.com>
 
        * breakpoint.c (save_breakpoints): Verify whether

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 502ac148fb5828d97c784a62ba3956ac2d836c8c..f93500f019ddd55a572793cb9d52b96f19469800 100644 (file)
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -9043,7 +9043,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 58f2a21f9ad077bdc23119c268cb57c9348aa618..145f097d6a02c2555e3eb6af58a1db4af35d9a31 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-15  Thiago Jung Bauermann  <bauerman@br.ibm.com>
+
+       * gdb.base/watchpoint.exp (test_inaccessible_watchpoint): Don't
+       expect a colon in watch -location output.
+
 2011-03-31  Tom Tromey  <tromey@redhat.com>
 
        * gdb.python/py-prettyprint.py (exception_flag): New global.

diff --git a/gdb/testsuite/gdb.base/watchpoint.exp b/gdb/testsuite/gdb.base/watchpoint.exp
index 7450602075d69e6404b33207713a720b98b303fe..1d8c5bcbf6b31bc9e7b2827913d8edba99db7c38 100644 (file)
--- 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