diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/inferior.c | 4 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/kill-detach-inferiors-cmd.exp | 2 |
4 files changed, 18 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9dd5c0b..3cef009 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2020-10-29 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com> + + PR gdb/19318 + * inferior.c (detach_inferior_command): Restore the current thread. + (kill_inferior_command): Ditto. + 2020-10-28 Tom de Vries <tdevries@suse.de> PR symtab/26772 diff --git a/gdb/inferior.c b/gdb/inferior.c index f775938..f06c13b 100644 --- a/gdb/inferior.c +++ b/gdb/inferior.c @@ -547,6 +547,8 @@ detach_inferior_command (const char *args, int from_tty) if (!args || !*args) error (_("Requires argument (inferior id(s) to detach)")); + scoped_restore_current_thread restore_thread; + number_or_range_parser parser (args); while (!parser.finished ()) { @@ -584,6 +586,8 @@ kill_inferior_command (const char *args, int from_tty) if (!args || !*args) error (_("Requires argument (inferior id(s) to kill)")); + scoped_restore_current_thread restore_thread; + number_or_range_parser parser (args); while (!parser.finished ()) { diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 24bc0d8..0c162bc 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2020-10-29 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com> + + * gdb.base/kill-detach-inferiors-cmd.exp: Check that 'kill + inferiors' and 'detach inferiors' do not change the current + inferior. + 2020-10-29 Tom de Vries <tdevries@suse.de> * gdb.threads/tls.exp: Fix DUPLICATEs. diff --git a/gdb/testsuite/gdb.base/kill-detach-inferiors-cmd.exp b/gdb/testsuite/gdb.base/kill-detach-inferiors-cmd.exp index 82e0c71..0688760 100644 --- a/gdb/testsuite/gdb.base/kill-detach-inferiors-cmd.exp +++ b/gdb/testsuite/gdb.base/kill-detach-inferiors-cmd.exp @@ -46,9 +46,11 @@ gdb_test "attach $test_pid" "Attaching to process.*" "attach to pid" # Kill the first two inferiors, and detach the third. gdb_test_no_output "kill inferiors 1 2" +gdb_test "info inferiors 3" "\r\n\\* 3 \[^\r\n\]+" "inf 3 is still current" gdb_test "inferior 1" "Switching to inferior 1.*" gdb_test "kill" "The program is not being run.*" gdb_test "detach inferiors 3" "Detaching from program.*process $test_pid.*" +gdb_test "info inferiors 1" "\r\n\\* 1 \[^\r\n\]+" "inf 1 is still current" # No inferiors should be running anymore. gdb_test "kill inferiors 1 2 3" \ |