diff options
| author | Tom de Vries <tdevries@suse.de> | 2020-02-04 17:30:05 +0100 |
|---|---|---|
| committer | Tom de Vries <tdevries@suse.de> | 2020-02-04 17:30:05 +0100 |
| commit | f90ac7c2bbd56492f566dbeff2e464a999d03fb8 (patch) | |
| tree | e8ec89f68474b3de22e61caca372e71e93511e11 | |
| parent | 24872cb30211b650a9360edd2476a6a1dd033cbb (diff) | |
| download | gdb-f90ac7c2bbd56492f566dbeff2e464a999d03fb8.zip gdb-f90ac7c2bbd56492f566dbeff2e464a999d03fb8.tar.gz gdb-f90ac7c2bbd56492f566dbeff2e464a999d03fb8.tar.bz2 | |
[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 <tdevries@suse.de>
* lib/gdb.exp (inferior_exited_re): Use "\[^\n\r\]*" instead of ".*".
Change-Id: Id7b1dcecd8c7fda3d1ab34b4fa1364d301748333
| -rw-r--r-- | gdb/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/testsuite/lib/gdb.exp | 2 |
2 files changed, 5 insertions, 1 deletions
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 <tdevries@suse.de> + * lib/gdb.exp (inferior_exited_re): Use "\[^\n\r\]*" instead of ".*". + +2020-02-04 Tom de Vries <tdevries@suse.de> + * lib/gdb.exp (inferior_exited_re): Use non-capturing parentheses. 2020-02-03 Rogerio A. Cardoso <rcardoso@linux.ibm.com> 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 @@ 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. |