From patchwork Tue Feb 4 16:32:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Simon Marchi (Code Review)" X-Patchwork-Id: 37675 Received: (qmail 83744 invoked by alias); 4 Feb 2020 16:32:14 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 83678 invoked by uid 89); 4 Feb 2020 16:32:13 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.1 spammy= X-HELO: mx1.osci.io Received: from polly.osci.io (HELO mx1.osci.io) (8.43.85.229) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 04 Feb 2020 16:32:11 +0000 Received: by mx1.osci.io (Postfix, from userid 994) id 53E382049E; Tue, 4 Feb 2020 11:32:10 -0500 (EST) Received: from gnutoolchain-gerrit.osci.io (gnutoolchain-gerrit.osci.io [IPv6:2620:52:3:1:5054:ff:fe06:16ca]) by mx1.osci.io (Postfix) with ESMTP id C132D20178; Tue, 4 Feb 2020 11:32:07 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by gnutoolchain-gerrit.osci.io (Postfix) with ESMTP id A5BC928170; Tue, 4 Feb 2020 11:32:07 -0500 (EST) X-Gerrit-PatchSet: 3 Date: Tue, 4 Feb 2020 11:32:07 -0500 From: "Sourceware to Gerrit sync (Code Review)" To: Tom de Vries , gdb-patches@sourceware.org Cc: Simon Marchi Auto-Submitted: auto-generated X-Gerrit-MessageType: merged Subject: [pushed] [gdb/testsuite] Make inferior_exited_re match a single line X-Gerrit-Change-Id: Id7b1dcecd8c7fda3d1ab34b4fa1364d301748333 X-Gerrit-Change-Number: 764 X-Gerrit-ChangeURL: X-Gerrit-Commit: f90ac7c2bbd56492f566dbeff2e464a999d03fb8 In-Reply-To: References: Reply-To: noreply@gnutoolchain-gerrit.osci.io, simon.marchi@polymtl.ca, tdevries@suse.de, gdb-patches@sourceware.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Gerrit/3.0.3-79-g83ff7f88f1 Message-Id: <20200204163207.A5BC928170@gnutoolchain-gerrit.osci.io> Sourceware to Gerrit sync has submitted this change. Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/764 ...................................................................... [gdb/testsuite] Make inferior_exited_re match a single line The current inferior_exited_re regexp contains a '.*': ... set inferior_exited_re "(?:\\\[Inferior \[0-9\]+ \\(.*\\) exited)" ... This means that while matching a single line: ... $ tclsh % set re "(?:\\\[Inferior \[0-9\]+ \\(.*\\) exited)" (?:\[Inferior [0-9]+ \(.*\) exited) % set line "\[Inferior 1 (process 33) exited\]\n" [Inferior 1 (process 33) exited] % regexp $re $line 1 ... it also matches more than one line: ... $ tclsh % set re "(?:\\\[Inferior \[0-9\]+ \\(.*\\) exited)" (?:\[Inferior [0-9]+ \(.*\) exited) % set line "\[Inferior 1 (process 33) exited\]\n\[Inferior 2 (process 44) exited\]\n" [Inferior 1 (process 33) exited] [Inferior 2 (process 44) exited] % regexp $re $line 1 ... Fix this by using "\[^\n\r\]*" instead of ".*". Build and reg-tested on x86_64-linux. gdb/testsuite/ChangeLog: 2020-02-04 Tom de Vries * lib/gdb.exp (inferior_exited_re): Use "\[^\n\r\]*" instead of ".*". Change-Id: Id7b1dcecd8c7fda3d1ab34b4fa1364d301748333 --- M gdb/testsuite/ChangeLog M gdb/testsuite/lib/gdb.exp 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index bc61679..8fcf67b 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2020-02-04 Tom de Vries + * lib/gdb.exp (inferior_exited_re): Use "\[^\n\r\]*" instead of ".*". + +2020-02-04 Tom de Vries + * lib/gdb.exp (inferior_exited_re): Use non-capturing parentheses. 2020-02-03 Rogerio A. Cardoso diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 25bed76..eb1d145 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -117,7 +117,7 @@ set octal "\[0-7\]+" -set inferior_exited_re "(?:\\\[Inferior \[0-9\]+ \\(.*\\) exited)" +set inferior_exited_re "(?:\\\[Inferior \[0-9\]+ \\(\[^\n\r\]*\\) exited)" # A regular expression that matches a value history number. # E.g., $1, $2, etc.