This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: [PATCH] Accept all-stop alternative in mi_expect_interrupt
- From: Pedro Alves <palves at redhat dot com>
- To: Simon Marchi <simon dot marchi at ericsson dot com>, gdb-patches at sourceware dot org
- Date: Wed, 04 Mar 2015 22:05:38 +0000
- Subject: Re: [PATCH] Accept all-stop alternative in mi_expect_interrupt
- Authentication-results: sourceware.org; auth=none
- References: <1425505473-20729-1-git-send-email-simon dot marchi at ericsson dot com>
On 03/04/2015 09:44 PM, Simon Marchi wrote:
> gdb/testsuite/lib/mi-support.exp | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp
> index 20546f6..b8f6334 100644
> --- a/gdb/testsuite/lib/mi-support.exp
> +++ b/gdb/testsuite/lib/mi-support.exp
> @@ -1195,14 +1195,14 @@ proc mi_expect_interrupt { test } {
> set prompt_re "$mi_gdb_prompt$"
> }
>
> - set r "reason=\"signal-received\",signal-name=\"0\",signal-meaning=\"Signal 0\""
> -
> + set r_nonstop "reason=\"signal-received\",signal-name=\"0\",signal-meaning=\"Signal 0\""
> + set r_allstop "reason=\"signal-received\",signal-name=\"SIGINT\",signal-meaning=\"Interrupt\""
Add:
set r "(${r_nonstop}|${r_allstop})"
and then you don't need this hunk below (and don't need to write the same thing twice):
> set any "\[^\n\]*"
>
> # A signal can land anywhere, just ignore the location
> - verbose -log "mi_expect_interrupt: expecting: \\*stopped,${r}$any\r\n$prompt_re"
> + verbose -log "mi_expect_interrupt: expecting: \\*stopped,(${r_nonstop}|${r_allstop})$any\r\n$prompt_re"
> gdb_expect {
> - -re "\\*stopped,${r}$any\r\n$prompt_re" {
> + -re "\\*stopped,(${r_nonstop}|${r_allstop})$any\r\n$prompt_re" {
> pass "$test"
> return 0
> }
>
OK with that change.
Thanks,
Pedro Alves