diff options
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/main.c | 9 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 9 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/bp-cmds-run-with-ex.c | 22 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/bp-cmds-run-with-ex.exp | 49 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/bp-cmds-run-with-ex.gdb | 19 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.gdb/python-interrupts.exp | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.gdb/python-selftest.exp | 2 |
8 files changed, 114 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8b94c02..64e38ae 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2020-12-07 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com> + + * main.c (catch_command_errors): Add a flag parameter; invoke + `bpstat_do_actions` if the flag is set. + (execute_cmdargs): Update a call to `catch_command_errors`. + 2020-12-07 Tom de Vries <tdevries@suse.de> * ada-lang.c (replace_operator_with_call): Handle shrink resize. @@ -439,7 +439,8 @@ typedef void (catch_command_errors_const_ftype) (const char *, int); static int catch_command_errors (catch_command_errors_const_ftype command, - const char *arg, int from_tty) + const char *arg, int from_tty, + bool do_bp_actions = false) { try { @@ -448,6 +449,10 @@ catch_command_errors (catch_command_errors_const_ftype command, command (arg, from_tty); maybe_wait_sync_command_done (was_sync); + + /* Do any commands attached to breakpoint we stopped at. */ + if (do_bp_actions) + bpstat_do_actions (); } catch (const gdb_exception &e) { @@ -531,7 +536,7 @@ execute_cmdargs (const std::vector<struct cmdarg> *cmdarg_vec, !batch_flag); else if (cmdarg_p.type == cmd_type) *ret = catch_command_errors (execute_command, cmdarg_p.string, - !batch_flag); + !batch_flag, true); } } diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 2c4553d..62228d4 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2020-12-07 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com> + + * gdb.base/bp-cmds-run-with-ex.c: New file. + * gdb.base/bp-cmds-run-with-ex.exp: New file. + * gdb.base/bp-cmds-run-with-ex.gdb: New file. + * gdb.gdb/python-interrupts.exp: Update the call to + 'catch_command_errors' with the new argument. + * gdb.gdb/python-selftest.exp: Ditto. + 2020-12-04 Simon Marchi <simon.marchi@efficios.com> * gdb.arch/amd64-disp-step-avx.exp: Adjust pattern. diff --git a/gdb/testsuite/gdb.base/bp-cmds-run-with-ex.c b/gdb/testsuite/gdb.base/bp-cmds-run-with-ex.c new file mode 100644 index 0000000..f4825c8 --- /dev/null +++ b/gdb/testsuite/gdb.base/bp-cmds-run-with-ex.c @@ -0,0 +1,22 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2020 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +int +main () +{ + return 0; +} diff --git a/gdb/testsuite/gdb.base/bp-cmds-run-with-ex.exp b/gdb/testsuite/gdb.base/bp-cmds-run-with-ex.exp new file mode 100644 index 0000000..447a387 --- /dev/null +++ b/gdb/testsuite/gdb.base/bp-cmds-run-with-ex.exp @@ -0,0 +1,49 @@ +# This testcase is part of GDB, the GNU debugger. + +# Copyright 2020 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# Test that breakpoint commands are taken into account when the +# debuggee program is executed with a "run" command given through the +# '-ex' option. + +standard_testfile + +if {[build_executable "failed to prepare" $testfile $srcfile]} { + return -1 +} + +set script_file $srcdir/$subdir/$testfile.gdb + +save_vars { GDBFLAGS } { + append GDBFLAGS " -x ${script_file}" + append GDBFLAGS " -ex run" + append GDBFLAGS " --args ${binfile}" + + gdb_exit + if {[gdb_spawn] != 0} { + fail "spawn gdb" + return -1 + } +} + +gdb_test_multiple "" "execute bp commands" { + -re " = 123\r\n$gdb_prompt $" { + pass $gdb_test_name + } + -re "Don't know how to run.*$gdb_prompt $" { + unsupported $gdb_test_name + } +} diff --git a/gdb/testsuite/gdb.base/bp-cmds-run-with-ex.gdb b/gdb/testsuite/gdb.base/bp-cmds-run-with-ex.gdb new file mode 100644 index 0000000..c8da9d7 --- /dev/null +++ b/gdb/testsuite/gdb.base/bp-cmds-run-with-ex.gdb @@ -0,0 +1,19 @@ +# Copyright 2020 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +break main +commands + print 123 +end diff --git a/gdb/testsuite/gdb.gdb/python-interrupts.exp b/gdb/testsuite/gdb.gdb/python-interrupts.exp index 6e5ce6e..b99b23e 100644 --- a/gdb/testsuite/gdb.gdb/python-interrupts.exp +++ b/gdb/testsuite/gdb.gdb/python-interrupts.exp @@ -25,7 +25,7 @@ proc test_python_interrupts {} { } gdb_breakpoint set_active_ext_lang temporary - gdb_test "call catch_command_errors(execute_command, \"python print(5)\", 0)" \ + gdb_test "call catch_command_errors(execute_command, \"python print(5)\", 0, true)" \ "Temporary breakpoint.*silently stop." gdb_test "signal SIGINT" \ "KeyboardInterrupt.*Error while executing Python code." diff --git a/gdb/testsuite/gdb.gdb/python-selftest.exp b/gdb/testsuite/gdb.gdb/python-selftest.exp index ee40245..0c769f2 100644 --- a/gdb/testsuite/gdb.gdb/python-selftest.exp +++ b/gdb/testsuite/gdb.gdb/python-selftest.exp @@ -22,7 +22,7 @@ proc selftest_python {} { } gdb_test_no_output "set variable gdb_python_initialized = 0" - gdb_test "call catch_command_errors(execute_command, \"python print(5)\", 0)" \ + gdb_test "call catch_command_errors(execute_command, \"python print(5)\", 0, true)" \ "Python not initialized.* = 0" return 0 } |