From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-116526-listarch-gdb-patches=sources.redhat.com@sourceware.org>
Received: (qmail 29435 invoked by alias); 9 Oct 2014 13:41:36 -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 29423 invoked by uid 89); 9 Oct 2014 13:41:35 -0000
Authentication-Results: sourceware.org; auth=none
X-Virus-Found: No
X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.3.2
X-HELO: relay1.mentorg.com
Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 09 Oct 2014 13:41:34 +0000
Received: from svr-orw-fem-04.mgc.mentorg.com ([147.34.97.41])	by relay1.mentorg.com with esmtp 	id 1XcDyF-0004CZ-Cs from Yao_Qi@mentor.com ; Thu, 09 Oct 2014 06:41:31 -0700
Received: from GreenOnly (147.34.91.1) by svr-orw-fem-04.mgc.mentorg.com (147.34.97.41) with Microsoft SMTP Server id 14.3.181.6; Thu, 9 Oct 2014 06:41:30 -0700
From: Yao Qi <yao@codesourcery.com>
To: Jan Kratochvil <jan.kratochvil@redhat.com>
CC: <gdb-patches@sourceware.org>, Miroslav Franc <mfranc@redhat.com>
Subject: Re: [patch] save breakpoints does not save signal catchpoints correctly
References: <20141003203219.GA30562@host2.jankratochvil.net>
Date: Thu, 09 Oct 2014 13:41:00 -0000
In-Reply-To: <20141003203219.GA30562@host2.jankratochvil.net> (Jan	Kratochvil's message of "Fri, 3 Oct 2014 22:32:19 +0200")
Message-ID: <87r3yhs6sr.fsf@codesourcery.com>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
X-IsSubscribed: yes
X-SW-Source: 2014-10/txt/msg00202.txt.bz2

Jan Kratochvil <jan.kratochvil@redhat.com> writes:

The fix looks right to me.  Just one comment on the test case...

> -    set contents [read -nonewline $fd]
> +    set contents [read $fd]
>      close $fd
>=20=20

IWBN to split the contents into a list and match each element in the
list one by one, so that ...

> +    set nl "\r?\n"
>      if {$arg =3D=3D ""} {
> -	set pattern "catch signal"
> +	set pattern "catch signal$nl"
>      } else {
> -	set pattern "catch signal $arg"
> +	set pattern "catch signal $arg$nl"
>      }
> -    if {[string match $pattern $contents]} {
> +    set pattern "${pattern}break main$nl"
> +    if {[regexp "$pattern" $contents]} {

... the pattern can be simplified and we can still use "string match".

On the other hand, in this way, the test can be easily extended in the
future, for example, saving more breakpoints in the file.

--=20
Yao (=E9=BD=90=E5=B0=A7)