gdb: Modify the output of "info breakpoints" and "delete breakpoints"

The output of "info breakpoints" includes breakpoint, watchpoint,
tracepoint, and catchpoint if they are created, so it should show
all the four types are deleted in the output of "info breakpoints"
to report empty list after "delete breakpoints".

It should also change the output of "delete breakpoints" to make it
clear that watchpoints, tracepoints, and catchpoints are also being
deleted. This is suggested by Guinevere Larsen, thank you.

$ make check-gdb TESTS="gdb.base/access-mem-running.exp"
$ gdb/gdb gdb/testsuite/outputs/gdb.base/access-mem-running/access-mem-running
[...]
(gdb) break main
Breakpoint 1 at 0x12000073c: file /home/loongson/gdb.git/gdb/testsuite/gdb.base/access-mem-running.c, line 32.
(gdb) watch global_counter
Hardware watchpoint 2: global_counter
(gdb) trace maybe_stop_here
Tracepoint 3 at 0x12000071c: file /home/loongson/gdb.git/gdb/testsuite/gdb.base/access-mem-running.c, line 27.
(gdb) catch fork
Catchpoint 4 (fork)
(gdb) info breakpoints
Num     Type           Disp Enb Address            What
1       breakpoint     keep y   0x000000012000073c in main at /home/loongson/gdb.git/gdb/testsuite/gdb.base/access-mem-running.c:32
2       hw watchpoint  keep y                      global_counter
3       tracepoint     keep y   0x000000012000071c in maybe_stop_here at /home/loongson/gdb.git/gdb/testsuite/gdb.base/access-mem-running.c:27
	not installed on target
4       catchpoint     keep y                      fork

Without this patch:

(gdb) delete breakpoints
Delete all breakpoints? (y or n) y
(gdb) info breakpoints
No breakpoints or watchpoints.
(gdb) info breakpoints 3
No breakpoint or watchpoint matching '3'.

With this patch:

(gdb) delete breakpoints
Delete all breakpoints, watchpoints, tracepoints, and catchpoints? (y or n) y
(gdb) info breakpoints
No breakpoints, watchpoints, tracepoints, or catchpoints.
(gdb) info breakpoints 3
No breakpoint, watchpoint, tracepoint, or catchpoint matching '3'.

Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
Approved-by: Kevin Buettner <kevinb@redhat.com>
Reviewed-By: Eli Zaretskii <eliz@gnu.org>

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 5f05657a8b3e0c855c8d8448faa1069e0cf68135..102bd7fad419ebf89dca94a2a0e26694e13cee11 100644 (file)
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -7080,10 +7080,11 @@ breakpoint_1 (const char *bp_num_list, bool show_internal,
       if (!filter)
        {
          if (bp_num_list == NULL || *bp_num_list == '\0')
-           uiout->message ("No breakpoints or watchpoints.\n");
+           uiout->message ("No breakpoints, watchpoints, tracepoints, "
+                           "or catchpoints.\n");
          else
-           uiout->message ("No breakpoint or watchpoint matching '%s'.\n",
-                           bp_num_list);
+           uiout->message ("No breakpoint, watchpoint, tracepoint, "
+                           "or catchpoint matching '%s'.\n", bp_num_list);
        }
     }
   else
@@ -12699,9 +12700,9 @@ delete_command (const char *arg, int from_tty)
     {
       int breaks_to_delete = 0;
 
-      /* Delete all breakpoints if no argument.  Do not delete
-        internal breakpoints, these have to be deleted with an
-        explicit breakpoint number argument.  */
+      /* Delete all breakpoints, watchpoints, tracepoints, and catchpoints
+        if no argument.  Do not delete internal breakpoints, these have to
+        be deleted with an explicit breakpoint number argument.  */
       for (breakpoint &b : all_breakpoints ())
        if (user_breakpoint_p (&b))
          {
@@ -12711,7 +12712,9 @@ delete_command (const char *arg, int from_tty)
 
       /* Ask user only if there are some breakpoints to delete.  */
       if (!from_tty
-         || (breaks_to_delete && query (_("Delete all breakpoints? "))))
+         || (breaks_to_delete
+             && query (_("Delete all breakpoints, watchpoints, tracepoints, "
+                         "and catchpoints? "))))
        for (breakpoint &b : all_breakpoints_safe ())
          if (user_breakpoint_p (&b))
            delete_breakpoint (&b);
@@ -14236,7 +14239,7 @@ delete_trace_command (const char *arg, int from_tty)
     {
       int breaks_to_delete = 0;
 
-      /* Delete all breakpoints if no argument.
+      /* Delete all tracepoints if no argument.
         Do not delete internal or call-dummy breakpoints, these
         have to be deleted with an explicit breakpoint number 
         argument.  */
@@ -14830,7 +14833,8 @@ This command may be abbreviated \"disable\"."),
 Delete all or some breakpoints.\n\
 Usage: delete [BREAKPOINTNUM]...\n\
 Arguments are breakpoint numbers with spaces in between.\n\
-To delete all breakpoints, give no argument.\n\
+To delete all breakpoints, watchpoints, tracepoints, and catchpoints,\n\
+give no argument.\n\
 \n\
 Also a prefix command for deletion of other GDB objects."),
                      &deletelist, 1, &cmdlist);
@@ -14841,7 +14845,8 @@ Also a prefix command for deletion of other GDB objects."),
 Delete all or some breakpoints or auto-display expressions.\n\
 Usage: delete breakpoints [BREAKPOINTNUM]...\n\
 Arguments are breakpoint numbers with spaces in between.\n\
-To delete all breakpoints, give no argument.\n\
+To delete all breakpoints, watchpoints, tracepoints, and catchpoints,\n\
+give no argument.\n\
 This command may be abbreviated \"delete\"."),
           &deletelist);
 

diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 79805486dd68ee26196606b8a83ea06cb2077f92..34cd567f81189cc32b88c33aae3b658ae58f0801 100644 (file)
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -4343,7 +4343,8 @@ running or not, what process it is, and why it stopped.
 @end table
 
 @menu
-* Breakpoints::                 Breakpoints, watchpoints, and catchpoints
+* Breakpoints::                 Breakpoints, watchpoints, tracepoints,
+                                and catchpoints
 * Continuing and Stepping::     Resuming execution
 * Skipping Over Functions and Files::
                                 Skipping over functions and files
@@ -4721,15 +4722,15 @@ optionally be surrounded by spaces.
 @cindex @code{$_} and @code{info breakpoints}
 @item info breakpoints @r{[}@var{list}@dots{}@r{]}
 @itemx info break @r{[}@var{list}@dots{}@r{]}
-Print a table of all breakpoints, watchpoints, and catchpoints set and
-not deleted.  Optional argument @var{n} means print information only
-about the specified breakpoint(s) (or watchpoint(s) or catchpoint(s)).
+Print a table of all breakpoints, watchpoints, tracepoints, and catchpoints set
+and not deleted.  Optional argument @var{n} means print information only about
+the specified breakpoint(s) (or watchpoint(s) or tracepoint(s) or catchpoint(s)).
 For each breakpoint, following columns are printed:
 
 @table @emph
 @item Breakpoint Numbers
 @item Type
-Breakpoint, watchpoint, or catchpoint.
+Breakpoint, watchpoint, tracepoint, or catchpoint.
 @item Disposition
 Whether the breakpoint is marked to be disabled or deleted when hit.
 @item Enabled or Disabled
@@ -5650,10 +5651,11 @@ in @ref{Location Specifications}.
 @kindex delete
 @kindex d @r{(@code{delete})}
 @item delete @r{[}breakpoints@r{]} @r{[}@var{list}@dots{}@r{]}
-Delete the breakpoints, watchpoints, or catchpoints of the breakpoint
-list specified as argument.  If no argument is specified, delete all
-breakpoints (@value{GDBN} asks confirmation, unless you have @code{set
-confirm off}).  You can abbreviate this command as @code{d}.
+Delete the breakpoints, watchpoints, tracepoints, or catchpoints of the
+breakpoint list specified as argument.  If no argument is specified, delete
+all breakpoints, watchpoints, tracepoints, and catchpoints (@value{GDBN} asks
+confirmation, unless you have @code{set confirm off}).  You can abbreviate this
+command as @code{d}.
 @end table
 
 @node Disabling
@@ -5665,10 +5667,10 @@ prefer to @dfn{disable} it.  This makes the breakpoint inoperative as if
 it had been deleted, but remembers the information on the breakpoint so
 that you can @dfn{enable} it again later.
 
-You disable and enable breakpoints, watchpoints, and catchpoints with
-the @code{enable} and @code{disable} commands, optionally specifying
-one or more breakpoint numbers as arguments.  Use @code{info break} to
-print a list of all breakpoints, watchpoints, and catchpoints if you
+You disable and enable breakpoints, watchpoints, tracepoints, and catchpoints
+with the @code{enable} and @code{disable} commands, optionally specifying
+one or more breakpoint numbers as arguments.  Use @code{info break} to print
+a list of all breakpoints, watchpoints, tracepoints, and catchpoints if you
 do not know which numbers to use.
 
 Disabling and enabling a breakpoint that has multiple locations
@@ -5696,7 +5698,7 @@ set with the @code{tbreak} command starts out in this state.
 @end itemize
 
 You can use the following commands to enable or disable breakpoints,
-watchpoints, and catchpoints:
+watchpoints, tracepoints, and catchpoints:
 
 @table @code
 @kindex disable
@@ -5874,7 +5876,7 @@ is decremented each time.  @xref{Convenience Vars, ,Convenience
 Variables}.
 @end table
 
-Ignore counts apply to breakpoints, watchpoints, and catchpoints.
+Ignore counts apply to breakpoints, watchpoints, tracepoints, and catchpoints.
 
 
 @node Break Commands
@@ -32987,8 +32989,8 @@ list of thread groups to which this breakpoint applies
 number of times the breakpoint has been hit
 @end table
 
-If there are no breakpoints or watchpoints, the @code{BreakpointTable}
-@code{body} field is an empty list.
+If there are no breakpoints, watchpoints, tracepoints, or catchpoints,
+the @code{BreakpointTable} @code{body} field is an empty list.
 
 @subsubheading @value{GDBN} Command
 
@@ -33980,7 +33982,7 @@ to execute until it reaches a debugger stop event.  If the
 it reaches a stop event.  Stop events may include
 @itemize @bullet
 @item
-breakpoints or watchpoints
+breakpoints, watchpoints, tracepoints, or catchpoints
 @item
 signals or exceptions
 @item

diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
index 0adaa6dbed63a94abaf0f72751029a9ae2b60e81..028422bb1e8d6b7e89e533f943be0c0950f8b90c 100644 (file)
--- a/gdb/ppc-linux-nat.c
+++ b/gdb/ppc-linux-nat.c
@@ -2358,8 +2358,8 @@ ppc_linux_nat_target::can_use_watchpoint_cond_accel (void)
 
   auto process_it = m_process_info.find (inferior_ptid.pid ());
 
-  /* No breakpoints or watchpoints have been requested for this process,
-     we have at least one free DVC register.  */
+  /* No breakpoints, watchpoints, tracepoints, or catchpoints have been
+     requested for this process, we have at least one free DVC register.  */
   if (process_it == m_process_info.end ())
     return true;
 

diff --git a/gdb/testsuite/gdb.arch/i386-dr3-watch.exp b/gdb/testsuite/gdb.arch/i386-dr3-watch.exp
index e2c89b879ad4d63d66cb32fec040b6ddfc7b38fa..84b3806d23440eac95fc06e24bef5ac2e4747134 100644 (file)
--- a/gdb/testsuite/gdb.arch/i386-dr3-watch.exp
+++ b/gdb/testsuite/gdb.arch/i386-dr3-watch.exp
@@ -76,7 +76,7 @@ gdb_test_multiple "watch gap1" "$test" {
 gdb_test "delete" \
     "" \
     "delete all watchpoints" \
-    {Delete all breakpoints\? \(y or n\) $} \
+    {Delete all breakpoints, watchpoints, tracepoints, and catchpoints\? \(y or n\) $} \
     "y"
 
 # If debug registers were left occupied by mistake, we'll fail to set

diff --git a/gdb/testsuite/gdb.base/annota-input-while-running.exp b/gdb/testsuite/gdb.base/annota-input-while-running.exp
index 1d1f523672d240d5ed60e2e398f2583fd49cbc77..46256226f448694b464f400d706d078e12a6aa58 100644 (file)
--- a/gdb/testsuite/gdb.base/annota-input-while-running.exp
+++ b/gdb/testsuite/gdb.base/annota-input-while-running.exp
@@ -57,7 +57,7 @@ gdb_annota_test "set annotate 2" ".*" "annotation set at level 2"
 
 set test "delete breakpoints"
 gdb_test_multiple "delete" $test {
-    -re "Delete all breakpoints. .y or n." {
+    -re "Delete all breakpoints, watchpoints, tracepoints, and catchpoints. .y or n." {
        send_gdb "y\n"
        exp_continue
     }

diff --git a/gdb/testsuite/gdb.base/break-unload-file.exp b/gdb/testsuite/gdb.base/break-unload-file.exp
index 2641feccec9a3c9f0fbefe3b176e664cb492eac7..2d62cc51cec10623ae2f486fdd4535fb2407c218 100644 (file)
--- a/gdb/testsuite/gdb.base/break-unload-file.exp
+++ b/gdb/testsuite/gdb.base/break-unload-file.exp
@@ -121,8 +121,8 @@ proc test_break { initial_load always_inserted break_command } {
        # re-insert, GDB would fill the shadow buffer with a
        # breakpoint instruction).  Avoid delete_breakpoints as that
        # doesn't record a pass/fail.
-       gdb_test "delete" "" "delete all breakpoints" \
-           "Delete all breakpoints.*y or n.*$" "y"
+       gdb_test "delete" "" "delete all breakpoints, watchpoints, tracepoints, and catchpoints" \
+           "Delete all breakpoints, watchpoints, tracepoints, and catchpoints.*y or n.*$" "y"
 
        # Re-add symbols back.
        set test "file \$binfile"

diff --git a/gdb/testsuite/gdb.base/break.exp b/gdb/testsuite/gdb.base/break.exp
index eda486a4945f5a25e1c911cba2dff360119c1dbe..cdb4c22a0342c5802eacd6b09d365d469f64b920 100644 (file)
--- a/gdb/testsuite/gdb.base/break.exp
+++ b/gdb/testsuite/gdb.base/break.exp
@@ -49,17 +49,17 @@ proc_with_prefix test_break {} {
     # for general use elsewhere.
     send_gdb "delete breakpoints\n"
     gdb_expect {
-        -re "Delete all breakpoints.*$" {
+        -re "Delete all breakpoints, watchpoints, tracepoints, and catchpoints.*$" {
                send_gdb "y\n"
                gdb_expect {
                    -re "$::gdb_prompt $" {
-                       fail "delete all breakpoints when none (unexpected prompt)"
+                       fail "delete all breakpoints, watchpoints, tracepoints, and catchpoints when none (unexpected prompt)"
                    }
-                   timeout     { fail "delete all breakpoints when none (timeout after unexpected prompt)" }
+                   timeout     { fail "delete all breakpoints, watchpoints, tracepoints, and catchpoints when none (timeout after unexpected prompt)" }
                }
            }
-        -re ".*$::gdb_prompt $"       { pass "delete all breakpoints when none" }
-       timeout             { fail "delete all breakpoints when none (timeout)" }
+        -re ".*$::gdb_prompt $"       { pass "delete all breakpoints, watchpoints, tracepoints, and catchpoints when none" }
+       timeout             { fail "delete all breakpoints, watchpoints, tracepoints, and catchpoints when none (timeout)" }
     }
 
     # test break at function

diff --git a/gdb/testsuite/gdb.base/breakpoint-in-ro-region.exp b/gdb/testsuite/gdb.base/breakpoint-in-ro-region.exp
index 48fc75cdfc8249f99f1b3432fc08048f67061e49..b0a51961870edd81865c5e75c290e215bb362b36 100644 (file)
--- a/gdb/testsuite/gdb.base/breakpoint-in-ro-region.exp
+++ b/gdb/testsuite/gdb.base/breakpoint-in-ro-region.exp
@@ -234,7 +234,7 @@ proc test_single_step { always_inserted auto_hw } {
     }
 
     gdb_test "maint info breakpoints 0" \
-       "No breakpoint or watchpoint matching '0'\." \
+       "No breakpoint, watchpoint, tracepoint, or catchpoint matching '0'\." \
        "single-step breakpoint is not left behind"
 
     # Confirm the thread really advanced.

diff --git a/gdb/testsuite/gdb.base/continue-after-aborted-step-over.exp b/gdb/testsuite/gdb.base/continue-after-aborted-step-over.exp
index 4aefc446ab7177307b45013094595991507b9f31..d5861357585c3f54f41e11ac27276fccd6476549 100644 (file)
--- a/gdb/testsuite/gdb.base/continue-after-aborted-step-over.exp
+++ b/gdb/testsuite/gdb.base/continue-after-aborted-step-over.exp
@@ -27,7 +27,7 @@
 #
 #  Command aborted.
 #  delete breakpoints
-#  Delete all breakpoints? (y or n) y
+#  Delete all breakpoints, watchpoints, tracepoints, and catchpoints? (y or n) y
 #  (gdb) b function
 #  Breakpoint 3 at 0x40048b: file test.c, line 33.
 #  continue

diff --git a/gdb/testsuite/gdb.base/default.exp b/gdb/testsuite/gdb.base/default.exp
index 98dad7cb30953294de6e4ba4e504393b730316e7..291722e62c8c831ccb10c5c7cd47472e07e8d1cb 100644 (file)
--- a/gdb/testsuite/gdb.base/default.exp
+++ b/gdb/testsuite/gdb.base/default.exp
@@ -265,7 +265,7 @@ gdb_test "info args" "No frame selected."
 #test info bogus-gdb-command
 gdb_test "info bogus-gdb-command" "Undefined info command: \"bogus-gdb-command\".  Try \"help info\".*"
 #test info breakpoints
-gdb_test "info breakpoints" "No breakpoints or watchpoints."
+gdb_test "info breakpoints" "No breakpoints, watchpoints, tracepoints, or catchpoints."
 #test info copying
 # The license text is very big, so it may overwhelm Expect's output buffer
 # and cause the test to fail occasionally.  To avoid this problem, verify

diff --git a/gdb/testsuite/gdb.base/del.exp b/gdb/testsuite/gdb.base/del.exp
index 2a715e8e77522d56b8dfdbc1c0178661a2ab5fb8..58937de656f8f615dcf7bb9375272ad4d6a633b6 100644 (file)
--- a/gdb/testsuite/gdb.base/del.exp
+++ b/gdb/testsuite/gdb.base/del.exp
@@ -35,7 +35,7 @@ proc test_delete_alias { alias } {
              "remove all breakpoints"
 
     gdb_test "info break" \
-             "No breakpoints or watchpoints." \
+            "No breakpoints, watchpoints, tracepoints, or catchpoints." \
              "info break after clearing breakpoints"
 
 
@@ -50,7 +50,7 @@ proc test_delete_alias { alias } {
              "Remove last breakpoint"
 
     gdb_test "info break" \
-             "No breakpoints or watchpoints." \
+            "No breakpoints, watchpoints, tracepoints, or catchpoints." \
              "info break after removing break on main"
 }
 

diff --git a/gdb/testsuite/gdb.base/ena-dis-br.exp b/gdb/testsuite/gdb.base/ena-dis-br.exp
index e7259f672de0b1ce1b543cbfcf3c28fc3fb78f56..924133e0d904aa52efca8aaf4011fc052fdc7ba9 100644 (file)
--- a/gdb/testsuite/gdb.base/ena-dis-br.exp
+++ b/gdb/testsuite/gdb.base/ena-dis-br.exp
@@ -140,7 +140,7 @@ gdb_test "continue" \
     "continue to auto-deleted break marker3"
 
 gdb_test "info break $bp" \
-    ".*No breakpoint or watchpoint matching.*" \
+    ".*No breakpoint, watchpoint, tracepoint, or catchpoint matching.*" \
     "info auto-deleted break marker3"
 
 # Verify that we can set a breakpoint and manually disable it (we've

diff --git a/gdb/testsuite/gdb.base/foll-fork.exp b/gdb/testsuite/gdb.base/foll-fork.exp
index abbbeece6bd35fd3a7b0cbcf37c554ccbe90fe70..ecf2111d4fdc067c9252c7a25cdce0c03c6f0609 100644 (file)
--- a/gdb/testsuite/gdb.base/foll-fork.exp
+++ b/gdb/testsuite/gdb.base/foll-fork.exp
@@ -289,7 +289,7 @@ proc_with_prefix catch_fork_child_follow {second_inferior} {
     gdb_test "delete breakpoints" \
        "" \
        "set follow-fork child, cleanup" \
-       "Delete all breakpoints. \\(y or n\\) $" \
+       "Delete all breakpoints, watchpoints, tracepoints, and catchpoints. \\(y or n\\) $" \
        "y"
 }
 
@@ -316,7 +316,7 @@ proc_with_prefix catch_fork_unpatch_child {} {
        "Catchpoint \[0-9\]* \\(forked process \[0-9\]*\\),.*" \
        "unpatch child, catch fork"
 
-    # Delete all breakpoints and catchpoints.
+    # Delete all breakpoints, watchpoints, tracepoints, and catchpoints.
     delete_breakpoints
 
     # Force $srcfile as the current GDB source can be in glibc sourcetree.
@@ -393,7 +393,7 @@ proc_with_prefix tcatch_fork_parent_follow {} {
     gdb_test "delete breakpoints" \
        "" \
        "set follow-fork parent, cleanup" \
-       "Delete all breakpoints. \\(y or n\\) $" \
+       "Delete all breakpoints, watchpoints, tracepoints, and catchpoints. \\(y or n\\) $" \
        "y"
 }
 

diff --git a/gdb/testsuite/gdb.base/hbreak-unmapped.exp b/gdb/testsuite/gdb.base/hbreak-unmapped.exp
index fd88f37f098958ad7bc823a82f85879e2a425422..ccb4b20c458e8e222df80464e98c21a084820230 100644 (file)
--- a/gdb/testsuite/gdb.base/hbreak-unmapped.exp
+++ b/gdb/testsuite/gdb.base/hbreak-unmapped.exp
@@ -71,5 +71,5 @@ gdb_test "info break" "hw breakpoint.*y.*0x0\+\[ \t\]\+" \
 gdb_test_no_output "delete \$bpnum" "" "delete" \
     "delete hw breakpoint"
 
-gdb_test "info break" "No breakpoints or watchpoints\." \
-    "info break shows no breakpoints"
+gdb_test "info break" "No breakpoints, watchpoints, tracepoints, or catchpoints\." \
+    "info break shows no breakpoints, watchpoints, tracepoints, or catchpoints"

diff --git a/gdb/testsuite/gdb.base/hbreak2.exp b/gdb/testsuite/gdb.base/hbreak2.exp
index 211baa2a8494992a206ae6a546da9030aa623f7b..8f5735b790f6d80c0bc4225a795c0ebd07a6a34e 100644 (file)
--- a/gdb/testsuite/gdb.base/hbreak2.exp
+++ b/gdb/testsuite/gdb.base/hbreak2.exp
@@ -228,7 +228,7 @@ gdb_test "continue" \
     "continue to hardware breakpoint at }"
 
 #
-# Delete all breakpoints so we can start over, course this can be a test too.
+# Delete all breakpoints, watchpoints, tracepoints, and catchpoints so we can start over, course this can be a test too.
 #
 delete_breakpoints
 

diff --git a/gdb/testsuite/gdb.base/help.exp b/gdb/testsuite/gdb.base/help.exp
index daa8c4aade88740f5ebc0dd835a93d24adedf60f..5ea5c79d3ec29b48f374d9514d079ef32b6ee937 100644 (file)
--- a/gdb/testsuite/gdb.base/help.exp
+++ b/gdb/testsuite/gdb.base/help.exp
@@ -89,7 +89,8 @@ set expected_help_delete {
     "Delete all or some breakpoints\.\[\r\n\]+"
     "Usage: delete \\\[BREAKPOINTNUM\\\]...\[\r\n\]+"
     "Arguments are breakpoint numbers with spaces in between\.\[\r\n\]+"
-    "To delete all breakpoints, give no argument\.\[\r\n\]+"
+    "To delete all breakpoints, watchpoints, tracepoints, and catchpoints,\.\[\r\n\]+"
+    "give no argument\.\[\r\n\]+"
     "Also a prefix command for deletion of other GDB objects\.\[\r\n\]+"
 }
 test_prefix_command_help {"d" "delete"} $expected_help_delete "help delete \"d\" abbreviation"

diff --git a/gdb/testsuite/gdb.base/new-ui.exp b/gdb/testsuite/gdb.base/new-ui.exp
index a58d62f9ed13fb449f4737254c6e8001160ee1ba..97166925c1bf86192b231658652d416d964a6274 100644 (file)
--- a/gdb/testsuite/gdb.base/new-ui.exp
+++ b/gdb/testsuite/gdb.base/new-ui.exp
@@ -130,17 +130,17 @@ proc_with_prefix do_test {} {
     # Verify that we get proper queries on the main UI, but that they are
     # auto-answered on secondary UIs.
     with_spawn_id $gdb_main_spawn_id {
-       gdb_test "delete" "" "delete all breakpoint on main console" \
-                "Delete all breakpoints. .y or n. $" "n"
+       gdb_test "delete" "" "delete all breakpoints, watchpoints, tracepoints, and catchpoints on main console" \
+                "Delete all breakpoints, watchpoints, tracepoints, and catchpoints. .y or n. $" "n"
     }
     with_spawn_id $extra_spawn_id {
        # Check output in two stages in order to override
        # gdb_test_multiple's internal "got interactive prompt" fail
        # that would otherwise match if the expect buffer happens to
        # fill with partial output that ends in "(y or n) ".
-       set test "delete all breakpoints on extra console"
+       set test "delete all breakpoints, watchpoints, tracepoints, and catchpoints on extra console"
        gdb_test_multiple "delete" $test {
-           -re "Delete all breakpoints. .y or n. " {
+           -re "Delete all breakpoints, watchpoints, tracepoints, and catchpoints. .y or n. " {
                gdb_test "" \
                    ".answered Y; input not from terminal." \
                    $test

diff --git a/gdb/testsuite/gdb.base/save-bp.exp b/gdb/testsuite/gdb.base/save-bp.exp
index ee870101fdee6b1f05ca0462d9b4edc4fc2a357e..2872d7b2c6c33ab20205a3a73a429d9be297eb9d 100644 (file)
--- a/gdb/testsuite/gdb.base/save-bp.exp
+++ b/gdb/testsuite/gdb.base/save-bp.exp
@@ -22,8 +22,8 @@ if { [prepare_for_testing "failed to prepare" ${testfile} $srcfile] } {
 if ![runto_main] {
     return -1
 }
-# Delete all breakpoints so that the "runto_main" breakpoint above
-# does not interfere with our testing.
+# Delete all breakpoints, watchpoints, tracepoints, and catchpoints so that
+# the "runto_main" breakpoint above does not interfere with our testing.
 delete_breakpoints
 
 # Insert a bunch of breakpoints... The goal is to create breakpoints
@@ -64,8 +64,8 @@ clean_restart $testfile
 if ![runto_main] {
     return -1
 }
-# Delete all breakpoints so that the "runto_main" breakpoint above
-# does not interfere with our testing.
+# Delete all breakpoints, watchpoints, tracepoints, and catchpoints so that
+# the "runto_main" breakpoint above does not interfere with our testing.
 delete_breakpoints
 
 # ... and restore the breakpoints.

diff --git a/gdb/testsuite/gdb.base/sepdebug.exp b/gdb/testsuite/gdb.base/sepdebug.exp
index 4182eb2b6a8298562b0753eb40389978b8774b6b..ee9bea2045a2bb40e35b9a2eacd88194a72427d9 100644 (file)
--- a/gdb/testsuite/gdb.base/sepdebug.exp
+++ b/gdb/testsuite/gdb.base/sepdebug.exp
@@ -219,7 +219,7 @@ gdb_test "step" \
     "step onto breakpoint"
 
 #
-# delete all breakpoints so we can start over, course this can be a test too
+# delete all breakpoints, watchpoints, tracepoints, and catchpoints so we can start over, course this can be a test too
 #
 delete_breakpoints
 

diff --git a/gdb/testsuite/gdb.base/server-del-break.exp b/gdb/testsuite/gdb.base/server-del-break.exp
index e18bb7d79c2aa2e41b4cc3bd9bd58acb4fe2d789..db598783d885c919105de1147549ef86f688ab23 100644 (file)
--- a/gdb/testsuite/gdb.base/server-del-break.exp
+++ b/gdb/testsuite/gdb.base/server-del-break.exp
@@ -29,10 +29,10 @@ gdb_test "break -q main" \
 
 # Try deleting all breakpoints, using the "server" command prefix.
 # Prefixing the "delete breakpoints" with "server" should turn
-# the confirmation request ("Delete all breakpoints? (y or n)")
+# the confirmation request ("Delete all breakpoints, watchpoints, tracepoints, and catchpoints? (y or n)")
 # off, hence we expect the operation to be executed without output.
 gdb_test_no_output "server delete breakpoints"
 
 # Double-check that the all breakpoints were in fact deleted.
 gdb_test "info break" \
-         "No breakpoints or watchpoints."
+        "No breakpoints, watchpoints, tracepoints, or catchpoints."

diff --git a/gdb/testsuite/gdb.cp/annota2.exp b/gdb/testsuite/gdb.cp/annota2.exp
index 3cd43bfb0693a35fea7712341281badb6f23f96d..1b1c26b0d86cd1e2806f887913c99a4774f7e733 100644 (file)
--- a/gdb/testsuite/gdb.cp/annota2.exp
+++ b/gdb/testsuite/gdb.cp/annota2.exp
@@ -158,11 +158,11 @@ gdb_test_multiple "continue" "continue until exit" {
 }
 
 #
-# delete all breakpoints
+# delete all breakpoints, watchpoints, tracepoints, and catchpoints
 #
 send_gdb "delete\n"
 gdb_expect {
-  -re ".*Delete all breakpoints. \\(y or n\\) \r\n\032\032query.*$" {
+  -re ".*Delete all breakpoints, watchpoints, tracepoints, and catchpoints. \\(y or n\\) \r\n\032\032query.*$" {
            send_gdb "y\n"
            gdb_expect {
             -re "\r\n\032\032post-query\r\n${breakpoints_invalid}$gdb_prompt$" { pass "delete bps" }

diff --git a/gdb/testsuite/gdb.cp/annota3.exp b/gdb/testsuite/gdb.cp/annota3.exp
index 978f3d566a73a5efc446b9f8fea2923f3ae289af..e5da031a25ce9fd95ba05afe7d2c546f5d0adcf0 100644 (file)
--- a/gdb/testsuite/gdb.cp/annota3.exp
+++ b/gdb/testsuite/gdb.cp/annota3.exp
@@ -114,11 +114,11 @@ lappend el "\r\n\032\032stopped\r\n"
 gdb_expect_list "continue to exit" "$gdb_prompt$" $el
 
 #
-# delete all breakpoints
+# delete all breakpoints, watchpoints, tracepoints, and catchpoints
 #
 send_gdb "delete\n"
 gdb_expect {
-  -re ".*Delete all breakpoints. \\(y or n\\) \r\n\032\032query.*$" {
+  -re ".*Delete all breakpoints, watchpoints, tracepoints, and catchpoints. \\(y or n\\) \r\n\032\032query.*$" {
            send_gdb "y\n"
            gdb_expect {
             -re "\r\n\032\032post-query\r\n$gdb_prompt$" { pass "delete bps" }

diff --git a/gdb/testsuite/gdb.cp/ovldbreak.exp b/gdb/testsuite/gdb.cp/ovldbreak.exp
index 01e7724e28926a7df6f991b0810e4fcd90f5204f..882a83ba8f345b2d9f8a7fe4e306bdbc80f352d0 100644 (file)
--- a/gdb/testsuite/gdb.cp/ovldbreak.exp
+++ b/gdb/testsuite/gdb.cp/ovldbreak.exp
@@ -309,23 +309,23 @@ with_test_prefix "multiple breakpoints" {
 
 send_gdb "delete breakpoints\n"
 gdb_expect {
-    -re "Delete all breakpoints.* $" {
+    -re "Delete all breakpoints, watchpoints, tracepoints, and catchpoints.* $" {
         send_gdb "y\n"
         gdb_expect {
             -re ".*$gdb_prompt $" {
-                pass "delete all breakpoints"
+               pass "delete all breakpoints, watchpoints, tracepoints, and catchpoints"
             }
             timeout {
-                fail "delete all breakpoints (timeout)"
+               fail "delete all breakpoints, watchpoints, tracepoints, and catchpoints (timeout)"
             }
         }
     }
     timeout {
-        fail "delete all breakpoints (timeout)"
+       fail "delete all breakpoints, watchpoints, tracepoints, and catchpoints (timeout)"
     }
 }
 
-gdb_test "info breakpoints" "No breakpoints or watchpoints." "breakpoint info (after delete)"
+gdb_test "info breakpoints" "No breakpoints, watchpoints, tracepoints, or catchpoints." "breakpoint info (after delete)"
 
 
 

diff --git a/gdb/testsuite/gdb.cp/save-bp-qualified.exp b/gdb/testsuite/gdb.cp/save-bp-qualified.exp
index 8eb5c98a7f6a92b34f3eaf6b8fa4cc1a43d9c51a..3f6ee0fb29f9e87a2039a68525de5fcf500127d9 100644 (file)
--- a/gdb/testsuite/gdb.cp/save-bp-qualified.exp
+++ b/gdb/testsuite/gdb.cp/save-bp-qualified.exp
@@ -29,8 +29,8 @@ proc restart {} {
     if ![runto_main] {
        return 0
     }
-    # Delete all breakpoints so that the "runto_main" breakpoint above
-    # does not interfere with our testing.
+    # Delete all breakpoints, watchpoints, tracepoints, and catchpoints so that
+    # the "runto_main" breakpoint above does not interfere with our testing.
     delete_breakpoints
 
     return 1

diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp
index 7eaa37ea0b47f7d65f01cd1a1b4290960a5630df..5268e7815ad85264296c011f76224cacb5be76d9 100644 (file)
--- a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp
@@ -160,8 +160,8 @@ proc do_test { start_label func_name tag } {
        return -1
     }
 
-    # Delete all breakpoints so that the output of "info breakpoints"
-    # below will only contain a single breakpoint.
+    # Delete all breakpoints, watchpoints, tracepoints, and catchpoints so that
+    # the output of "info breakpoints" below will only contain a single breakpoint.
     delete_breakpoints
 
     # Place a breakpoint within the function in the header file.

diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp
index 8b59bebfa0f70947aeab1939b6a093b79da5da50..d3a1fd38ed27b2b726b34c2e45384d9c012c4ba5 100644 (file)
--- a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp
@@ -148,8 +148,8 @@ if ![runto_main] {
     return -1
 }
 
-# Delete all breakpoints so that the output of "info breakpoints"
-# below will only contain a single breakpoint.
+# Delete all breakpoints, watchpoints, tracepoints, and catchpoints so that
+# the output of "info breakpoints" below will only contain a single breakpoint.
 delete_breakpoints
 
 # Place a breakpoint within the function in the header file.
@@ -162,8 +162,8 @@ gdb_test "info breakpoints" \
     ".* in callee at \[^\r\n\]+${srcfile4}:22\\y.*" \
     "check for breakpoint at ${srcfile4}"
 
-# Delete all breakpoints so that the output of "info breakpoints"
-# below will only contain a single breakpoint.
+# Delete all breakpoints, watchpoints, tracepoints, and catchpoints so that
+# the output of "info breakpoints" below will only contain a single breakpoint.
 delete_breakpoints
 
 # Place a breakpoint within the function in the header file.

diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp
index 9a0dac70ab4ec12cb4e46016a2b1825a4b5d5c87..66d9f645cf30b9f7454cd04dfd30ac3c557bfe46 100644 (file)
--- a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp
@@ -137,8 +137,8 @@ if ![runto_main] {
     return -1
 }
 
-# Delete all breakpoints so that the output of "info breakpoints"
-# below will only contain a single breakpoint.
+# Delete all breakpoints, watchpoints, tracepoints, and catchpoints so that
+# the output of "info breakpoints" below will only contain a single breakpoint.
 delete_breakpoints
 
 # Place a breakpoint within the function in the header file.

diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-small-func.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-small-func.exp
index 907d5383ba424332cddd8c0f4c8f1da9d54b2c1c..1ba346b97586fda02c9c1e72d3f8c8d06a4f5d45 100644 (file)
--- a/gdb/testsuite/gdb.dwarf2/dw2-inline-small-func.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-small-func.exp
@@ -122,8 +122,8 @@ if ![runto_main] {
     return -1
 }
 
-# Delete all breakpoints so that the output of "info breakpoints"
-# below will only contain a single breakpoint.
+# Delete all breakpoints, watchpoints, tracepoints, and catchpoints so that
+# the output of "info breakpoints" below will only contain a single breakpoint.
 delete_breakpoints
 
 # Place a breakpoint within the function in the header file.

diff --git a/gdb/testsuite/gdb.guile/scm-breakpoint.exp b/gdb/testsuite/gdb.guile/scm-breakpoint.exp
index 2e38e262379d858d09ae1c88975f59dd48151fcf..73e24135254c67354910a01c5e030b6a960831bc 100644 (file)
--- a/gdb/testsuite/gdb.guile/scm-breakpoint.exp
+++ b/gdb/testsuite/gdb.guile/scm-breakpoint.exp
@@ -224,7 +224,7 @@ proc_with_prefix test_bkpt_invisible { } {
     gdb_test "guile (print (breakpoint-visible? ibp))" \
        "= #f" "check breakpoint invisibility"
     gdb_test "info breakpoints" \
-       "No breakpoints or watchpoints.*" \
+       "No breakpoints, watchpoints, tracepoints, or catchpoints.*" \
        "check info breakpoints does not show invisible breakpoints"
     gdb_test "maint info breakpoints" \
        "scm-breakpoint\.c:$ibp_location.*" \
@@ -287,7 +287,7 @@ proc_with_prefix test_bkpt_internal { } {
     gdb_scm_test_silent_cmd "guile (register-breakpoint! wp1)" \
        "register wp1"
     gdb_test "info breakpoints" \
-       "No breakpoints or watchpoints.*" \
+       "No breakpoints, watchpoints, tracepoints, or catchpoints.*" \
        "check info breakpoints does not show invisible watchpoint"
     gdb_test "maint info breakpoints" \
        ".*watchpoint.*result.*" \
@@ -511,7 +511,7 @@ proc_with_prefix test_bkpt_temporary { } {
        ".*$srcfile:$ibp_location.*"
     gdb_test "guile (print (breakpoint-temporary? ibp))" "Invalid object: <gdb:breakpoint>.*" \
        "check temporary breakpoint is deleted after being hit"
-    gdb_test "info breakpoints" "No breakpoints or watchpoints.*" \
+    gdb_test "info breakpoints" "No breakpoints, watchpoints, tracepoints, or catchpoints.*" \
        "check info breakpoints shows temporary breakpoint is deleted"
 }
 

diff --git a/gdb/testsuite/gdb.linespec/cpexplicit.exp b/gdb/testsuite/gdb.linespec/cpexplicit.exp
index 4e7b462f414c41f66784544444630f79a8c8c63b..5c93c34ab4ada4b9426a9bbadccbd7625ecff0a6 100644 (file)
--- a/gdb/testsuite/gdb.linespec/cpexplicit.exp
+++ b/gdb/testsuite/gdb.linespec/cpexplicit.exp
@@ -31,8 +31,8 @@ namespace eval $testfile {
     # at LOCATION.
     proc test_breakpoint {linespec location} {
 
-       # Delete all breakpoints, set a new breakpoint at LINESPEC,
-       # and attempt to run to it.
+       # Delete all breakpoints, watchpoints, tracepoints, and catchpoints,
+       # set a new breakpoint at LINESPEC, and attempt to run to it.
        delete_breakpoints
        gdb_breakpoint $linespec
        gdb_continue_to_breakpoint $linespec $location

diff --git a/gdb/testsuite/gdb.linespec/explicit.exp b/gdb/testsuite/gdb.linespec/explicit.exp
index 6e80931f7c787435335a8e00ecbb5865e3185914..625f9cee0fcd5879ce93a3ca35baa233b4c8c2e9 100644 (file)
--- a/gdb/testsuite/gdb.linespec/explicit.exp
+++ b/gdb/testsuite/gdb.linespec/explicit.exp
@@ -33,8 +33,8 @@ namespace eval $testfile {
     proc test_breakpoint {linespec location} {
 
        set testname "set breakpoint at \"$linespec\""
-       # Delete all breakpoints, set a new breakpoint at LINESPEC,
-       # and attempt to run to it.
+       # Delete all breakpoints, watchpoints, tracepoints, and catchpoints,
+       # set a new breakpoint at LINESPEC, and attempt to run to it.
        delete_breakpoints
        if {[gdb_breakpoint $linespec]} {
            pass $testname

diff --git a/gdb/testsuite/gdb.mi/mi-py-modify-bp.exp b/gdb/testsuite/gdb.mi/mi-py-modify-bp.exp
index 54f63d6d797c120113ebc948ac63f0604428abf0..79fcf9f68b4b4a091e9781fecbf21566719f8634 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-py-modify-bp.exp
+++ b/gdb/testsuite/gdb.mi/mi-py-modify-bp.exp
@@ -34,7 +34,7 @@ set remote_python_file [gdb_remote_download host \
 mi_clean_restart $binfile
 mi_runto_main
 
-# Delete all breakpoints.
+# Delete all breakpoints, watchpoints, tracepoints, and catchpoints.
 mi_delete_breakpoints
 
 # Create a breakpoint.  At this point the breakpoint is global, but

diff --git a/gdb/testsuite/gdb.mi/mi-return.exp b/gdb/testsuite/gdb.mi/mi-return.exp
index ce4e9710671d4231fb3a312acded4b7fa010cc33..dafa1504a1af18358bf266c2ba746e7ac37c553b 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-return.exp
+++ b/gdb/testsuite/gdb.mi/mi-return.exp
@@ -50,7 +50,7 @@ mi_runto callee4
 
 mi_gdb_test "205-break-delete" \
        "205\\^done.*" \
-       "delete all breakpoints"
+       "delete all breakpoints, watchpoints, tracepoints, and catchpoints"
 
 test_return_simple
 

diff --git a/gdb/testsuite/gdb.mi/mi-thread-specific-bp.exp b/gdb/testsuite/gdb.mi/mi-thread-specific-bp.exp
index 8245f06c1b7f7433d2e4a689516fc3102556ae92..715e0f7e8047be5ad4de9f2d1d361dc3cf60d9f5 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-thread-specific-bp.exp
+++ b/gdb/testsuite/gdb.mi/mi-thread-specific-bp.exp
@@ -56,7 +56,7 @@ foreach_mi_ui_mode mode {
     # trigger an assertion.
     if {$mode eq "separate"} {
        with_spawn_id $gdb_main_spawn_id {
-           gdb_test "info breakpoints" "No breakpoints or watchpoints\\." \
+           gdb_test "info breakpoints" "No breakpoints, watchpoints, tracepoints, or catchpoints\\." \
                "check CLI 'info breakpoints' when there are no breakpoints"
        }
     }

diff --git a/gdb/testsuite/gdb.multi/inferior-specific-bp.exp b/gdb/testsuite/gdb.multi/inferior-specific-bp.exp
index 843261004694084f4a876ffc8a10017b7f3c414e..5cc451b0ecc1aa4bc709945cf34fa1a404647919 100644 (file)
--- a/gdb/testsuite/gdb.multi/inferior-specific-bp.exp
+++ b/gdb/testsuite/gdb.multi/inferior-specific-bp.exp
@@ -176,4 +176,4 @@ gdb_test "remove-inferiors 1" \
 
 # Now check 'info breakpoints' to ensure the breakpoint is gone.
 gdb_test "info breakpoints $bp_number" \
-    "No breakpoint or watchpoint matching '$bp_number'\\."
+    "No breakpoint, watchpoint, tracepoint, or catchpoint matching '$bp_number'\\."

diff --git a/gdb/testsuite/gdb.opt/inline-small-func.exp b/gdb/testsuite/gdb.opt/inline-small-func.exp
index c71dfb9cd8ff7c35567f20c42f3772ba44542f99..9090e23dd61920c3cad220eb076b26cce7dee2fa 100644 (file)
--- a/gdb/testsuite/gdb.opt/inline-small-func.exp
+++ b/gdb/testsuite/gdb.opt/inline-small-func.exp
@@ -45,8 +45,8 @@ if ![runto_main] {
     return -1
 }
 
-# Delete all breakpoints so that the output of "info breakpoints"
-# below will only contain a single breakpoint.
+# Delete all breakpoints, watchpoints, tracepoints, and catchpoints so that
+# the output of "info breakpoints" below will only contain a single breakpoint.
 delete_breakpoints
 
 # Place a breakpoint within the function in the header file.

diff --git a/gdb/testsuite/gdb.python/py-breakpoint.exp b/gdb/testsuite/gdb.python/py-breakpoint.exp
index 67da48d2f48da4f3db46fd199a74b584170c7abe..ef4c929fb1549778a69f6347222e274ba992f4cd 100644 (file)
--- a/gdb/testsuite/gdb.python/py-breakpoint.exp
+++ b/gdb/testsuite/gdb.python/py-breakpoint.exp
@@ -333,7 +333,7 @@ proc_with_prefix test_bkpt_invisible { } {
        "py-breakpoint\.c:$ibp_location*" "Check breakpoint location 2"
     gdb_test "python print (ilist\[0\].visible)" \
        "False" "Check breakpoint visibility 2"
-    gdb_test "info breakpoints" "No breakpoints or watchpoints.*" \
+    gdb_test "info breakpoints" "No breakpoints, watchpoints, tracepoints, or catchpoints.*" \
        "Check info breakpoints does not show invisible breakpoints"
     gdb_test "maint info breakpoints" \
        "py-breakpoint\.c:$ibp_location.*" \
@@ -428,7 +428,7 @@ proc_with_prefix test_bkpt_internal { } {
     gdb_py_test_silent_cmd  "python wp1 = gdb.Breakpoint (\"result\", type=gdb.BP_WATCHPOINT, wp_class=gdb.WP_WRITE, internal=True )" \
        "Set watchpoint" 0
     gdb_test "info breakpoints" \
-       "No breakpoints or watchpoints.*" \
+       "No breakpoints, watchpoints, tracepoints, or catchpoints.*" \
        "Check info breakpoints does not show invisible breakpoints"
     gdb_test "maint info breakpoints" \
        ".*watchpoint.*result.*" \
@@ -591,7 +591,7 @@ proc_with_prefix test_bkpt_temporary { } {
        "Check temporary stop callback executed before deletion."
     gdb_test "python print (ibp.temporary)" "RuntimeError: Breakpoint 2 is invalid.*" \
        "Check temporary breakpoint is deleted after being hit"
-    gdb_test "info breakpoints" "No breakpoints or watchpoints.*" \
+    gdb_test "info breakpoints" "No breakpoints, watchpoints, tracepoints, or catchpoints.*" \
        "Check info breakpoints shows temporary breakpoint is deleted"
 }
 
@@ -600,7 +600,7 @@ proc_with_prefix test_bkpt_temporary { } {
 proc_with_prefix test_bkpt_address {} {
     global gdb_prompt decimal srcfile
 
-    # Delete all breakpoints
+    # Delete all breakpoints, watchpoints, tracepoints, and catchpoints
     delete_breakpoints
 
     gdb_test "python gdb.Breakpoint(\"*main\")" \

diff --git a/gdb/testsuite/gdb.reverse/ppc_record_test_isa_3_1.exp b/gdb/testsuite/gdb.reverse/ppc_record_test_isa_3_1.exp
index 0306a9de7ca32936559f6a4ce2053d9e75b6db57..06257f9471e7ec395859d041543578f6cb28e2c4 100644 (file)
--- a/gdb/testsuite/gdb.reverse/ppc_record_test_isa_3_1.exp
+++ b/gdb/testsuite/gdb.reverse/ppc_record_test_isa_3_1.exp
@@ -105,7 +105,7 @@ gdb_test_no_output "set exec-direction forward" "start forward test3"
 gdb_test "record stop" ".*Process record is stopped.*" "stopped recording 2"
 set test_del_bkpts "delete breakpoints, answer prompt 2"
 
-# Delete all breakpoints and catchpoints.
+# Delete all breakpoints, watchpoints, tracepoints, and catchpoints.
 delete_breakpoints
 
 gdb_test_no_output "record" "start recording test2"

diff --git a/gdb/testsuite/gdb.threads/continue-pending-after-query.exp b/gdb/testsuite/gdb.threads/continue-pending-after-query.exp
index 41487c9a84517572cb3c25fb45170f0f2b0253f0..7f2a60a673f436eda0d67a0e66f06db9c50a7cf9 100644 (file)
--- a/gdb/testsuite/gdb.threads/continue-pending-after-query.exp
+++ b/gdb/testsuite/gdb.threads/continue-pending-after-query.exp
@@ -67,7 +67,7 @@ proc test {} {
     set test "delete breakpoints, answer prompt"
     set saw_prompt 0
     gdb_test_multiple "delete breakpoints" $test {
-       -re "Delete all breakpoints.*y or n.*$" {
+       -re "Delete all breakpoints, watchpoints, tracepoints, and catchpoints.*y or n.*$" {
            set saw_prompt 1
            send_gdb "y\n"
            exp_continue

diff --git a/gdb/testsuite/gdb.threads/continue-pending-status.exp b/gdb/testsuite/gdb.threads/continue-pending-status.exp
index f998625a00c95e4d5badf068841398351371dbcb..32da7ec2d526d1d643dc54fe8117e3cc9a9571e1 100644 (file)
--- a/gdb/testsuite/gdb.threads/continue-pending-status.exp
+++ b/gdb/testsuite/gdb.threads/continue-pending-status.exp
@@ -89,9 +89,9 @@ for {set i 0} {$i < $attempts} {incr i} {
            "Switching to thread $thread .*" \
            "switch to non-event thread"
 
-       # Delete all breakpoints so that continuing doesn't switch
-       # back to the event thread to do a step-over, which would mask
-       # away the original bug, which depended on the event thread
+       # Delete all breakpoints, watchpoints, tracepoints, and catchpoints
+       # so that continuing doesn't switch back to the event thread to do a step-over,
+       # which would mask away the original bug, which depended on the event thread
        # still having TARGET_STOPPED_BY_SW_BREAKPOINT stop_reason.
        delete_breakpoints
 

diff --git a/gdb/testsuite/gdb.threads/thread_check.exp b/gdb/testsuite/gdb.threads/thread_check.exp
index ba80a8971a5cf1f8522f1cdb6ffed300859b9c10..83fa86dc359c870753aa395cfe8bd0df69f673f8 100644 (file)
--- a/gdb/testsuite/gdb.threads/thread_check.exp
+++ b/gdb/testsuite/gdb.threads/thread_check.exp
@@ -28,7 +28,7 @@
 # - create 2 breakpoints #1 main() #2 tf() (the thread function)
 # - run gdb till #1 main() breakpoint is reached
 # - continue to breakpoint #2 tf()
-# - delete all breakpoints 
+# - delete all breakpoints, watchpoints, tracepoints, and catchpoints
 # - exit gdb.
 
 
@@ -71,7 +71,7 @@ gdb_test "backtrace" \
 
 
 #
-# delete all breakpoints
+# delete all breakpoints, watchpoints, tracepoints, and catchpoints
 #
 delete_breakpoints
 

diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 9a906f0f349a01c9dc194e3a9846486b48ded99d..7357d56f89a8c154b29e7d3835dc958c8ce3bd56 100644 (file)
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -373,10 +373,10 @@ proc delete_breakpoints {} {
     #
     set timeout 100
 
-    set msg "delete all breakpoints in delete_breakpoints"
+    set msg "delete all breakpoints, watchpoints, tracepoints, and catchpoints in delete_breakpoints"
     set deleted 0
     gdb_test_multiple "delete breakpoints" "$msg" {
-       -re "Delete all breakpoints.*y or n.*$" {
+       -re "Delete all breakpoints, watchpoints, tracepoints, and catchpoints.*y or n.*$" {
            send_gdb "y\n" answer
            exp_continue
        }
@@ -390,7 +390,7 @@ proc delete_breakpoints {} {
        set deleted 0
        set msg "info breakpoints"
        gdb_test_multiple $msg $msg {
-           -re "No breakpoints or watchpoints..*$gdb_prompt $" {
+           -re "No breakpoints, watchpoints, tracepoints, or catchpoints..*$gdb_prompt $" {
                set deleted 1
            }
            -re "$gdb_prompt $" {

diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp
index 001e4ee0970c15b7645d3d962a581b6f53f99ca1..b3a27efb15546bcf3da2a4a0b536130f26f83854 100644 (file)
--- a/gdb/testsuite/lib/mi-support.exp
+++ b/gdb/testsuite/lib/mi-support.exp
@@ -355,25 +355,25 @@ proc mi_delete_breakpoints {} {
 # FIXME: The mi operation won't accept a prompt back and will use the 'all' arg
     send_gdb "102-break-delete\n"
     gdb_expect 30 {
-        -re "Delete all breakpoints.*y or n.*$" {
+        -re "Delete all breakpoints, watchpoints, tracepoints, and catchpoints.*y or n.*$" {
            send_gdb "y\n"
            exp_continue
         }
         -re "102-break-delete\r\n102\\\^done\r\n$mi_gdb_prompt$" {
             # This happens if there were no breakpoints
         }
-        timeout { perror "Delete all breakpoints in mi_delete_breakpoints (timeout)" ; return }
+        timeout { perror "Delete all breakpoints, watchpoints, tracepoints, and catchpoints in mi_delete_breakpoints (timeout)" ; return }
     }
 
-# The correct output is not "No breakpoints or watchpoints." but an
+# The correct output is not "No breakpoints, watchpoints, tracepoints, or catchpoints." but an
 # empty BreakpointTable. Also, a query is not acceptable with mi.
     send_gdb "103-break-list\n"
     gdb_expect 30 {
         -re "103-break-list\r\n103\\\^done,BreakpointTable=\{\}\r\n$mi_gdb_prompt$" {}
         -re "103-break-list\r\n103\\\^done,BreakpointTable=\{nr_rows=\".\",nr_cols=\".\",hdr=\\\[\{width=\".*\",alignment=\".*\",col_name=\"number\",colhdr=\"Num\"\}.*colhdr=\"Type\".*colhdr=\"Disp\".*colhdr=\"Enb\".*colhdr=\"Address\".*colhdr=\"What\".*\\\],body=\\\[\\\]\}\r\n$mi_gdb_prompt$" {}
-        -re "103-break-list\r\n103\\\^doneNo breakpoints or watchpoints.\r\n\r\n$mi_gdb_prompt$" {warning "Unexpected console text received"}
+        -re "103-break-list\r\n103\\\^doneNo breakpoints, watchpoints, tracepoints, or catchpoints.\r\n\r\n$mi_gdb_prompt$" {warning "Unexpected console text received"}
         -re "$mi_gdb_prompt$" { perror "Breakpoints not deleted" ; return }
-        -re "Delete all breakpoints.*or n.*$" {
+        -re "Delete all breakpoints, watchpoints, tracepoints, and catchpoints.*or n.*$" {
            warning "Unexpected prompt for breakpoints deletion"
            send_gdb "y\n"
            exp_continue

diff --git a/gdbserver/mem-break.cc b/gdbserver/mem-break.cc
index e2cb13feef0324d0f91b19b5c365a12b3c062a8b..c23bb46c666a0c8261dbe8f396747c12f9fc1ca9 100644 (file)
--- a/gdbserver/mem-break.cc
+++ b/gdbserver/mem-break.cc
@@ -1999,7 +1999,8 @@ check_mem_write (CORE_ADDR mem_addr, unsigned char *buf,
     delete_disabled_breakpoints ();
 }
 
-/* Delete all breakpoints, and un-insert them from the inferior.  */
+/* Delete all breakpoints, watchpoints, tracepoints, and catchpoints,
+   and un-insert them from the inferior.  */
 
 void
 delete_all_breakpoints (void)
@@ -2021,8 +2022,8 @@ mark_breakpoints_out (struct process_info *proc)
     raw_bp->inserted = 0;
 }
 
-/* Release all breakpoints, but do not try to un-insert them from the
-   inferior.  */
+/* Release all breakpoints, watchpoints, tracepoints, and catchpoints,
+   but do not try to un-insert them from the inferior.  */
 
 void
 free_all_breakpoints (struct process_info *proc)

diff --git a/gdbserver/mem-break.h b/gdbserver/mem-break.h
index 99689c9998c0c9cd3719280ea110b22bc0c4396b..36521184226b755cdb17206e4e995fd302389ddd 100644 (file)
--- a/gdbserver/mem-break.h
+++ b/gdbserver/mem-break.h
@@ -216,7 +216,8 @@ void check_mem_read (CORE_ADDR mem_addr, unsigned char *buf, int mem_len);
 void check_mem_write (CORE_ADDR mem_addr,
                      unsigned char *buf, const unsigned char *myaddr, int mem_len);
 
-/* Delete all breakpoints.  */
+/* Delete all breakpoints, watchpoints, tracepoints, and catchpoints,
+   and un-insert them from the inferior.  */
 
 void delete_all_breakpoints (void);
 
@@ -224,8 +225,8 @@ void delete_all_breakpoints (void);
 
 void mark_breakpoints_out (struct process_info *proc);
 
-/* Delete all breakpoints, but do not try to un-insert them from the
-   inferior.  */
+/* Delete all breakpoints, watchpoints, tracepoints, and catchpoints,
+   but do not try to un-insert them from the inferior.  */
 
 void free_all_breakpoints (struct process_info *proc);