diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/infrun.c | 10 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/help.exp | 6 |
4 files changed, 19 insertions, 6 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5d77a82..8c304b0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2012-08-23 Pedro Alves <palves@redhat.com> + * infrun.c (_initialize_infrun) <handle command help text>: + Mention that multiple signals are supported. + +2012-08-23 Pedro Alves <palves@redhat.com> + * infcmd.c (_initialize_infcmd) <signal command>: Fix typo in help string. diff --git a/gdb/infrun.c b/gdb/infrun.c index 9628170..cbab993 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -7096,10 +7096,10 @@ Specify a signal as argument to print info on that signal only.")); add_info_alias ("handle", "signals", 0); c = add_com ("handle", class_run, handle_command, _("\ -Specify how to handle a signal.\n\ +Specify how to handle signals.\n\ Usage: handle SIGNAL [ACTIONS]\n\ Args are signals and actions to apply to those signals.\n\ -If no actions are specified, the current settings for the specified signal\n\ +If no actions are specified, the current settings for the specified signals\n\ will be displayed instead.\n\ \n\ Symbolic signals (e.g. SIGSEGV) are recommended but numeric signals\n\ @@ -7114,7 +7114,11 @@ Stop means reenter debugger if this signal happens (implies print).\n\ Print means print a message if this signal happens.\n\ Pass means let program see this signal; otherwise program doesn't know.\n\ Ignore is a synonym for nopass and noignore is a synonym for pass.\n\ -Pass and Stop may be combined.")); +Pass and Stop may be combined.\n\ +\n\ +Multiple signals may be specified. Signal numbers and signal names\n\ +may be interspersed with actions, with the actions being performed for\n\ +all signals cumulatively specified.")); set_cmd_completer (c, handle_completer); if (xdb_commands) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 7be6146..04e595f 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2012-08-23 Pedro Alves <palves@redhat.com> + + * gdb.base/help.exp: Adjust to "handle" help text change. + 2012-08-23 Yao Qi <yao@codesourcery.com> * gdb.trace/disconnected-tracing.c (start, end): New. diff --git a/gdb/testsuite/gdb.base/help.exp b/gdb/testsuite/gdb.base/help.exp index b6582ba..7fffd00 100644 --- a/gdb/testsuite/gdb.base/help.exp +++ b/gdb/testsuite/gdb.base/help.exp @@ -219,7 +219,7 @@ gdb_test "help h" "Print list of commands\." "help help \"h\" abbreviation" # test help help gdb_test "help help" "Print list of commands\." "help help" # test help handle -gdb_test "help handle" "Specify how to handle a signal\..*" "help handle" +gdb_test "help handle" "Specify how to handle signals\..*" "help handle" # test help info "i" abbreviation test_prefix_command_help {"i" "info"} { "Generic command for showing things about the program being debugged\.\[\r\n\]+" @@ -699,8 +699,8 @@ gdb_test "help info bogus-gdb-command" "Undefined info command: \"bogus-gdb-comm # test help gotcha gdb_test "help gotcha" "Undefined command: \"gotcha\"\. Try \"help\"\." "help gotcha" # test apropos regex -gdb_test "apropos \\\(print\[\^ bsiedf\\\".-\]\\\)" "handle -- Specify how to handle a signal" +gdb_test "apropos \\\(print\[\^ bsiedf\\\".-\]\\\)" "handle -- Specify how to handle signals" # test apropos >1 word string -gdb_test "apropos handle a signal" "handle -- Specify how to handle a signal" +gdb_test "apropos handle signal" "handle -- Specify how to handle signals" # test apropos apropos gdb_test "apropos apropos" "apropos -- Search for commands matching a REGEXP" |