From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-120479-listarch-gdb-patches=sources.redhat.com@sourceware.org>
Received: (qmail 77687 invoked by alias); 4 Mar 2015 22:58:24 -0000
Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <gdb-patches.sourceware.org>
List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sourceware.org>
List-Help: <mailto:gdb-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: gdb-patches-owner@sourceware.org
Received: (qmail 77675 invoked by uid 89); 4 Mar 2015 22:58:24 -0000
Authentication-Results: sourceware.org; auth=none
X-Virus-Found: No
X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL,BAYES_00,SPF_PASS autolearn=ham version=3.3.2
X-HELO: usevmg20.ericsson.net
Received: from usevmg20.ericsson.net (HELO usevmg20.ericsson.net) (198.24.6.45) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Wed, 04 Mar 2015 22:58:22 +0000
Received: from EUSAAHC001.ericsson.se (Unknown_Domain [147.117.188.75])	by usevmg20.ericsson.net (Symantec Mail Security) with SMTP id 02.0A.16061.45937F45; Wed,  4 Mar 2015 17:56:52 +0100 (CET)
Received: from [142.133.110.232] (147.117.188.8) by smtp-am.internal.ericsson.com (147.117.188.77) with Microsoft SMTP Server id 14.3.210.2; Wed, 4 Mar 2015 17:58:19 -0500
Message-ID: <54F78E0B.2070004@ericsson.com>
Date: Wed, 04 Mar 2015 22:58:00 -0000
From: Simon Marchi <simon.marchi@ericsson.com>
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0
MIME-Version: 1.0
To: Pedro Alves <palves@redhat.com>, <gdb-patches@sourceware.org>
Subject: Re: [PATCH] Accept all-stop alternative in mi_expect_interrupt
References: <1425505473-20729-1-git-send-email-simon.marchi@ericsson.com> <54F781B2.70303@redhat.com>
In-Reply-To: <54F781B2.70303@redhat.com>
Content-Type: text/plain; charset="windows-1252"
Content-Transfer-Encoding: 7bit
X-IsSubscribed: yes
X-SW-Source: 2015-03/txt/msg00143.txt.bz2

On 03/04/2015 05:05 PM, Pedro Alves wrote:
> 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):

Nice, done.

>>      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

Pushed with that modification.