diff options
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/breakpoint.c | 8 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.server/server-kill.exp | 65 |
4 files changed, 73 insertions, 14 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 11f2154..2b04c3c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2021-06-22 Andrew Burgess <andrew.burgess@embecosm.com> + + * breakpoint.c (insert_bp_location): If we catch a + TARGET_CLOSE_ERROR just rethrow it, the breakpoints might have + been deleted. + 2021-06-21 Andrew Burgess <andrew.burgess@embecosm.com> * NEWS: Mention new target feature name. diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index fb011fc..0595c6f 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -2698,6 +2698,14 @@ insert_bp_location (struct bp_location *bl, { /* Can't set the breakpoint. */ + /* If the target has closed then it will have deleted any + breakpoints inserted within the target inferior, as a result + any further attempts to interact with the breakpoint objects + is not possible. Just rethrow the error. */ + if (bp_excpt.error == TARGET_CLOSE_ERROR) + throw bp_excpt; + gdb_assert (bl->owner != nullptr); + /* In some cases, we might not be able to insert a breakpoint in a shared library that has already been removed, but we have not yet processed the shlib unload diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 0f5c152..88f8d96 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2021-06-22 Andrew Burgess <andrew.burgess@embecosm.com> + + * gdb.server/server-kill.exp: Introduce global kill_pid_of, and + make use of this in prepare to select which pid we should kill. + Run all the tests twice with a different kill_pid_of value. + (prepare): Make use of kill_pid_of. + (test_stepi): New proc. + 2021-06-21 Andrew Burgess <andrew.burgess@embecosm.com> * gdb.python/py-frame.exp: Add Frame.level tests. diff --git a/gdb/testsuite/gdb.server/server-kill.exp b/gdb/testsuite/gdb.server/server-kill.exp index 80d78f8..655821c 100644 --- a/gdb/testsuite/gdb.server/server-kill.exp +++ b/gdb/testsuite/gdb.server/server-kill.exp @@ -30,6 +30,21 @@ if { [build_executable "failed to prepare" ${testfile}] } { return -1 } +# Global control variable used by the proc prepare. Should be set to +# either 'inferior' or 'server'. +# +# In the proc prepare we start gdbserver and extract a pid, which will +# later be killed by calling the proc kill_server. +# +# When KILL_PID_OF is set to 'inferior' then the pid we kill is that +# of the inferior running under gdbserver, when this process dies +# gdbserver itself will exit. +# +# When KILL_PID_OF is set to 'server' then the pid we kill is that of +# the gdbserver itself, this is a much more aggressive strategy and +# exposes different bugs within GDB. +set kill_pid_of "inferior" + # Spawn GDBserver, run to main, extract GDBserver's PID and save it in # the SERVER_PID global. @@ -54,18 +69,22 @@ proc prepare {} { gdbserver_run "" - # Continue past server_pid assignment. - gdb_breakpoint ${srcfile}:[gdb_get_line_number "i = 0;"] - gdb_continue_to_breakpoint "after server_pid assignment" - - # Get the pid of GDBServer. - set test "p server_pid" - set server_pid 0 - gdb_test_multiple $test $test { - -re " = ($decimal)\r\n$gdb_prompt $" { - set server_pid $expect_out(1,string) - pass $test + if { $::kill_pid_of == "inferior" } { + # Continue past server_pid assignment. + gdb_breakpoint ${srcfile}:[gdb_get_line_number "i = 0;"] + gdb_continue_to_breakpoint "after server_pid assignment" + + # Get the pid of GDBServer. + set test "p server_pid" + set server_pid 0 + gdb_test_multiple $test $test { + -re " = ($decimal)\r\n$gdb_prompt $" { + set server_pid $expect_out(1,string) + pass $test + } } + } else { + set server_pid [exp_pid -i $::server_spawn_id] } if {$server_pid == 0} { @@ -132,6 +151,24 @@ proc_with_prefix test_unwind_syms {} { gdb_test "bt" "(Target disconnected|Remote connection closed|Remote communication error).*" } -test_tstatus -test_unwind_nosyms -test_unwind_syms +# Test performing a stepi right after the connection is dropped. + +proc_with_prefix test_stepi {} { + if ![prepare] { + return + } + + kill_server + + gdb_test "stepi" "(Target disconnected|Remote connection closed|Remote communication error).*" +} + +# Run each test twice, see the description of KILL_PID_OF earlier in +# this file for more details. + +foreach_with_prefix kill_pid_of { "inferior" "server" } { + test_tstatus + test_unwind_nosyms + test_unwind_syms + test_stepi +} |