From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 79325 invoked by alias); 4 Mar 2015 22:05:47 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 79311 invoked by uid 89); 4 Mar 2015 22:05:46 -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_HELO_PASS,SPF_PASS,T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Wed, 04 Mar 2015 22:05:45 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t24M5ebQ017467 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 4 Mar 2015 17:05:40 -0500 Received: from [127.0.0.1] (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t24M5cc1003579; Wed, 4 Mar 2015 17:05:39 -0500 Message-ID: <54F781B2.70303@redhat.com> Date: Wed, 04 Mar 2015 22:05:00 -0000 From: Pedro Alves User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 To: Simon Marchi , 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> In-Reply-To: <1425505473-20729-1-git-send-email-simon.marchi@ericsson.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-SW-Source: 2015-03/txt/msg00142.txt.bz2 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