diff options
| author | Tom Tromey <tromey@adacore.com> | 2024-02-23 13:51:58 -0700 |
|---|---|---|
| committer | Tom Tromey <tromey@adacore.com> | 2024-02-27 10:30:30 -0700 |
| commit | b452b96c1e57db42d50a42eb2f09f7c57681d073 (patch) | |
| tree | 29e1c3b609331913a4afe12df46dcbafd26cc8f6 | |
| parent | 6313c05640cf6e2f6b1b1b8e66789b34b45f19c7 (diff) | |
| download | gdb-b452b96c1e57db42d50a42eb2f09f7c57681d073.zip gdb-b452b96c1e57db42d50a42eb2f09f7c57681d073.tar.gz gdb-b452b96c1e57db42d50a42eb2f09f7c57681d073.tar.bz2 | |
Explicitly quit gdb from DAP server thread
This changes the DAP code to explicitly request that gdb exit.
Previously this could cause crashes, but with the previous cleanups,
this should no longer happen.
This also adds a tests that ensures that gdb exits with status 0.
| -rw-r--r-- | gdb/python/lib/gdb/dap/server.py | 1 | ||||
| -rw-r--r-- | gdb/testsuite/lib/dap-support.exp | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/gdb/python/lib/gdb/dap/server.py b/gdb/python/lib/gdb/dap/server.py index 6757f29..19840f4 100644 --- a/gdb/python/lib/gdb/dap/server.py +++ b/gdb/python/lib/gdb/dap/server.py @@ -230,6 +230,7 @@ class Server: # responses are flushed to the client before exiting. self.write_queue.put(None) json_writer.join() + send_gdb("quit") @in_dap_thread def send_event_later(self, event, body=None): diff --git a/gdb/testsuite/lib/dap-support.exp b/gdb/testsuite/lib/dap-support.exp index 89a4b0e..61355b5 100644 --- a/gdb/testsuite/lib/dap-support.exp +++ b/gdb/testsuite/lib/dap-support.exp @@ -403,6 +403,15 @@ proc dap_check_log_file_re { re } { proc dap_shutdown {{terminate false}} { dap_check_request_and_response "shutdown" disconnect \ [format {o terminateDebuggee [l %s]} $terminate] + + # Check gdb's exit status. + global gdb_spawn_id + set result [wait -i $gdb_spawn_id] + gdb_assert {[lindex $result 2] == 0} + gdb_assert {[lindex $result 3] == 0} + + clear_gdb_spawn_id + dap_check_log_file } |