[PATCH 2/3] [gdb/testsuite] Use gdb_exit_cleanup a bit more

[Tom de Vries <tdevries@suse.de>]

I ran into trouble running test-case gdb.base/quit-live.exp using a remote
host configuration:
- host board local-remote-host
- target board remote-gdbserver-on-localhost.

The problem is that the test-case makes gdb quit without updating
gdb_spawn_id.  Consequently, default_gdb_exit tries to exit gdb.
It does so by sending quit to gdb and waiting for it to exit, which get us:
...
ERROR: : spawn id exp9 not open
...

Fix this using gdb_exit_cleanup.  Likewise in gdb.threads/killed.exp.
---
 gdb/testsuite/gdb.base/quit-live.exp | 1 +
 gdb/testsuite/gdb.threads/killed.exp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/gdb/testsuite/gdb.base/quit-live.exp b/gdb/testsuite/gdb.base/quit-live.exp
index 14f87f9b7f8..8dae4fe2aca 100644
--- a/gdb/testsuite/gdb.base/quit-live.exp
+++ b/gdb/testsuite/gdb.base/quit-live.exp
@@ -152,6 +152,7 @@ proc quit_with_live_inferior {appear_how extra_inferior quit_how} {
 		gdb_test_multiple "" $test {
 		    eof {
 			pass $test
+			gdb_exit_cleanup
 		    }
 		}
 	    }
diff --git a/gdb/testsuite/gdb.threads/killed.exp b/gdb/testsuite/gdb.threads/killed.exp
index 39b60dff8dd..a52ae552a2c 100644
--- a/gdb/testsuite/gdb.threads/killed.exp
+++ b/gdb/testsuite/gdb.threads/killed.exp
@@ -76,6 +76,7 @@ gdb_expect {
     }
     eof {
 	pass "GDB exits after multi-threaded program exits messily"
+	gdb_exit_cleanup
     }
     -re "Cannot find thread ${decimal}: generic error\[\r\n\]*$gdb_prompt $" {
 	kfail "gdb/568" "GDB exits after multi-threaded program exits messily"
-- 
2.51.0