From f90ac7c2bbd56492f566dbeff2e464a999d03fb8 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Tue, 4 Feb 2020 17:30:05 +0100 Subject: [PATCH] [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 --- gdb/testsuite/ChangeLog | 4 ++++ gdb/testsuite/lib/gdb.exp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index bc61679387..8fcf67b13e 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +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. diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 25bed76432..eb1d145f2b 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -117,7 +117,7 @@ if ![info exists env(EXEEXT)] { 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. -- 2.34.1