From 780636aec079208cd8ee1079f27d0d5ac5dae48a Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Tue, 4 Feb 2020 09:53:50 +0100 Subject: [PATCH] [gdb/testsuite] Use non-capturing parentheses for inferior_exited_re The inferior_exited_re regexp uses capturing parentheses by default: ... set inferior_exited_re "(\\\[Inferior \[0-9\]+ \\(.*\\) exited)" ... The parentheses are there to be able to use the expression as an atom, f.i., to have '+' apply to the whole regexp in "${inferior_exited_re}+". But the capturing is not necessary, and it can be confusing because it's not obvious in a regexp using "$inferior_exited_re (bla|bli)" that the first captured expression is in $inferior_exited_re. Replace by non-capturing parentheses. If we still want to capture the expression, we can simply (and more clearly) use "($inferior_exited_re)". Build and reg-tested on x86_64-linux. gdb/testsuite/ChangeLog: 2020-02-04 Tom de Vries * lib/gdb.exp (inferior_exited_re): Use non-capturing parentheses. Change-Id: I7640c6129b1ada617424d6a63730d4b119c58ef3 --- 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 2b1a8ba7eeb..bc616793873 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 non-capturing parentheses. + 2020-02-03 Rogerio A. Cardoso * gdb.arch/powerpc-power8.exp: Delete trailing whitespace of diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 2d230b791ee..25bed764321 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\]+ \\(.*\\) exited)" # A regular expression that matches a value history number. # E.g., $1, $2, etc. -- 2.30.2