[gdb/testsuite] Fix gdb.base/batch-preserve-term-settings.exp with check-read1
authorTom de Vries <tdevries@suse.de>
Tue, 8 Jun 2021 12:50:45 +0000 (14:50 +0200)
committerTom de Vries <tdevries@suse.de>
Tue, 8 Jun 2021 12:50:45 +0000 (14:50 +0200)
commit4c5d7c03c4dec3dc4ae875696b20747c5a8dafb8
treee2463646a342aedd2e387a68841954ea573cf082
parent4a11703a04c64d34e79d51ad62dad176c92462c8
[gdb/testsuite] Fix gdb.base/batch-preserve-term-settings.exp with check-read1

With check-read1, I run into:
...
FAIL: gdb.base/batch-preserve-term-settings.exp: batch run: \
  terminal settings preserved
...

This is caused by spawn_shell matching too little output, after which
things start to go out of sync.

More specifically, the regexp:
...
       -re "PS1=\[^\r\n\]*\r\n.*$shell_prompt_re$" {
...
matches the first and part of the second line of this output:
...
PS1="gdb-subshell$ "^M
sh-4.4$ PS1="gdb-subshell$ "^M
gdb-subshell$
...
while it's supposed to match the entire output.

Fix this by splitting up the regexp into a part that skips the lines with PS1,
and one that reads the shell prompt.

Tested on x86_64-linux.

gdb/testsuite/ChangeLog:

2021-06-08  Tom de Vries  <tdevries@suse.de>

* gdb.base/batch-preserve-term-settings.exp (spawn_shell): Fix
matching of initial prompt.
gdb/testsuite/ChangeLog
gdb/testsuite/gdb.base/batch-preserve-term-settings.exp