This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: [patch] gdb_unload - account for another termination message
- From: Phil Muldoon <pmuldoon at redhat dot com>
- To: Pedro Alves <pedro at codesourcery dot com>
- Cc: gdb-patches at sourceware dot org
- Date: Tue, 15 Mar 2011 12:50:58 +0000
- Subject: Re: [patch] gdb_unload - account for another termination message
- References: <m3mxkwejog.fsf@redhat.com> <201103151219.11392.pedro@codesourcery.com>
- Reply-to: pmuldoon at redhat dot com
Pedro Alves <pedro@codesourcery.com> writes:
> On Tuesday 15 March 2011 10:56:31, Phil Muldoon wrote:
>>
>> While working on another bug I attempted to use gdb_unload in the
>> testsuite. I noticed that it did not account for a termination
>> message. (This was the one message I was getting). This would lead to a
>> timeout and failure. Is it ok to just add another -re test in the
>> original test here?
>
> The current code reads:
>
> proc gdb_unload {} {
> global verbose
> global GDB
> global gdb_prompt
> send_gdb "file\n"
> gdb_expect 60 {
> -re "No executable file now\[^\r\n\]*\[\r\n\]" { exp_continue }
> -re "No symbol file now\[^\r\n\]*\[\r\n\]" { exp_continue }
> -re "A program is being debugged already..*Kill it.*y or n. $"\
> { send_gdb "y\n"
> verbose "\t\tKilling previous program being debugged"
> exp_continue
> }
>
> I don't think the "Kill it" message can ever appear in response
> to a "file" command. This may be old behavior. I'd rather we
> replace this part with current reality.
Yeah I just wasn't sure here, I did the grep before I wrote the patch:
[pmuldoon@localhost gdb]$ egrep -irs "A program is being debugged" *.c
exec.c:326: && !query (_("A program is being debugged already.\n"
infcmd.c:2433: if (query (_("A program is being debugged already. Kill it? ")))
target.c:2446: || query (_("A program is being debugged already. Kill it? ")))
And there are three exit points. I thought briefly about standardizing
the message. Anyway, I'll replace the old message in gdb_unload.
> The full message I see is:
>
> (top-gdb) file gdb
> A program is being debugged already.
> Are you sure you want to change the file? (y or n)
>
> So please adjust the regex to catch the whole frase,
> not just the "Are you sure" part, which could paper
> over other questions. Also, "Killing previous program..." isn't
> what answering 'y' does.
>From my previous grep that could be the only response. But I take your
point well (and caution here costs nothing). I see no need for the
verbose, tbh. I'm not sure why I put it there.
--
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 1b601af..0d29428 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -137,9 +137,8 @@ proc gdb_unload {} {
gdb_expect 60 {
-re "No executable file now\[^\r\n\]*\[\r\n\]" { exp_continue }
-re "No symbol file now\[^\r\n\]*\[\r\n\]" { exp_continue }
- -re "A program is being debugged already..*Kill it.*y or n. $"\
- { send_gdb "y\n"
- verbose "\t\tKilling previous program being debugged"
+ -re "A program is being debugged already.*Are you sure you want to change the file?.*y or n. $" {
+ send_gdb "y\n"
exp_continue
}
-re "Discard symbol table from .*y or n.*$" {