249b573352
Since f67c0c9171 ("Enable 'set print inferior-events' and improve
detach/fork/kill/exit messages"), when detaching a remote process, we
get, for detach against a remote target:
(gdb) detach
Detaching from program: ...., process 5388
Ending remote debugging.
[Inferior 1 (Thread 5388.5388) detached]
^^^^^^^^^^^^^^^^
That is incorrect, for it is printing a thread id as string while we
should be printing the process id instead. I.e., either one of:
[Inferior 1 (process 5388) detached]
[Inferior 1 (Remote target) detached]
depending on remote stub support for the multi-process extensions.
Similarly, after killing a process, we're printing thread ids while we
should be printing process ids. E.g., on native GNU/Linux:
(gdb) k
Kill the program being debugged? (y or n) y
[Inferior 1 (Thread 0x7ffff7faa8c0 (LWP 30721)) has been killed]
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
while it should have been:
Kill the program being debugged? (y or n) y
[Inferior 1 (process 30721) has been killed]
^^^^^^^^^^^^^
There's a wording inconsistency between detach and kill:
[Inferior 1 (process 30721) has been killed]
[Inferior 1 (process 30721) detached]
Given we were already saying "detached" instead of "has been
detached", and we used to say just "exited", and given that the "has
been" doesn't really add any information, this commit changes the
message to just "killed":
[Inferior 1 (process 30721) killed]
gdb/ChangeLog:
2018-04-25 Pedro Alves <palves@redhat.com>
* infcmd.c (kill_command): Print the pid as string, not the whole
thread's ptid. Add comment. s/has been killed/killed/ in output
message.
* remote.c (remote_detach_1): Print the pid as string, not the
whole thread's ptid.
gdb/testsuite/ChangeLog:
2018-04-25 Pedro Alves <palves@redhat.com>
* gdb.base/hook-stop.exp: Expect "killed" instead of "has been
killed".
* gdb.base/kill-after-signal.exp: Likewise.
* gdb.threads/kill.exp: Likewise.
82 lines
2.2 KiB
Plaintext
82 lines
2.2 KiB
Plaintext
# This testcase is part of GDB, the GNU debugger.
|
|
|
|
# Copyright 2014-2018 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/>. */
|
|
|
|
standard_testfile
|
|
|
|
# Run the test proper. THREADED indicates whether to build a threaded
|
|
# program and spawn several threads before trying to kill the program.
|
|
|
|
proc test {threaded} {
|
|
global testfile srcfile decimal
|
|
|
|
with_test_prefix [expr ($threaded)?"threaded":"non-threaded"] {
|
|
|
|
set options {debug}
|
|
if {$threaded} {
|
|
lappend options "pthreads"
|
|
lappend options "additional_flags=-DUSE_THREADS"
|
|
set prog ${testfile}_threads
|
|
} else {
|
|
set prog ${testfile}_nothreads
|
|
}
|
|
|
|
if {[prepare_for_testing "failed to prepare" $prog $srcfile $options] == -1} {
|
|
return -1
|
|
}
|
|
|
|
if { ![runto main] } then {
|
|
fail "run to main"
|
|
return
|
|
}
|
|
|
|
set linenum [gdb_get_line_number "set break here"]
|
|
gdb_breakpoint "$srcfile:$linenum"
|
|
gdb_continue_to_breakpoint "break here" ".*break here.*"
|
|
|
|
if {$threaded} {
|
|
gdb_test "info threads" "1.*2.*3.*4.*5.*6.*" "all threads started"
|
|
}
|
|
|
|
# This kills and ensures no output other than the prompt comes out,
|
|
# like:
|
|
#
|
|
# (gdb) kill
|
|
# Kill the program being debugged? (y or n) y
|
|
# (gdb)
|
|
#
|
|
# If we instead saw more output, like e.g., with an extended-remote
|
|
# connection:
|
|
#
|
|
# (gdb) kill
|
|
# Kill the program being debugged? (y or n) y
|
|
# Remote connection closed
|
|
# (gdb)
|
|
#
|
|
# the above would mean that the remote end crashed.
|
|
|
|
gdb_test_multiple "kill" "kill" {
|
|
-re "Kill the program being debugged\\? \\(y or n\\) $" {
|
|
gdb_test "y" "\\\[Inferior $decimal \\(.*\\) killed\\\]" "kill"
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
foreach threaded {true false} {
|
|
test $threaded
|
|
}
|