diff options
| author | Tom de Vries <tdevries@suse.de> | 2020-12-16 21:32:59 +0100 |
|---|---|---|
| committer | Tom de Vries <tdevries@suse.de> | 2020-12-16 21:32:59 +0100 |
| commit | 592995fadd37e3a8d831fc3f48994c9d5cc2a974 (patch) | |
| tree | 097367b62ef3cddbe040f8b8357f81a959679748 /gdb | |
| parent | d6f26c9d2852286c0ff8053a1b6e688ae1ba0793 (diff) | |
| download | gdb-592995fadd37e3a8d831fc3f48994c9d5cc2a974.zip gdb-592995fadd37e3a8d831fc3f48994c9d5cc2a974.tar.gz gdb-592995fadd37e3a8d831fc3f48994c9d5cc2a974.tar.bz2 | |
[gdb/testsuite] Fix prompt regexp in batch-preserve-term-settings.exp
On openSUSE Leap 15.2, when running test-case
gdb.base/batch-preserve-term-settings.exp I get:
...
spawn /bin/sh^M
PS1="gdb-subshell$ "^M
sh-4.4$ PS1="gdb-subshell$ "^M
gdb-subshell$ PASS: gdb.base/batch-preserve-term-settings.exp: batch run: \
spawn shell
...
but on Ubuntu 18.04.5, I get instead:
...
spawn /bin/sh^M
PS1="gdb-subshell$ "^M
$ gdb-subshell$ FAIL: gdb.base/batch-preserve-term-settings.exp: batch run: \
spawn shell (timeout)
...
Fix this by making the regexp recognize the second pattern as well.
Tested on x86_64-linux.
gdb/testsuite/ChangeLog:
2020-12-16 Tom de Vries <tdevries@suse.de>
* gdb.base/batch-preserve-term-settings.exp:
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/batch-preserve-term-settings.exp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 51d768c..3a7fc0c 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2020-12-16 Tom de Vries <tdevries@suse.de> + * gdb.base/batch-preserve-term-settings.exp: + +2020-12-16 Tom de Vries <tdevries@suse.de> + * lib/gdb.exp (gdb_compile_shlib_1): Factor out of ... (gdb_compile_shlib): ... here. Filter out PIE-related flags. diff --git a/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp b/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp index c39d638..3e35d20 100644 --- a/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp +++ b/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp @@ -47,7 +47,7 @@ proc spawn_shell {} { set gotit 0 set test "spawn shell" gdb_expect { - -re "PS1=\[^\r\n\]*\r\n$shell_prompt_re$" { + -re "PS1=\[^\r\n\]*\r\n.*$shell_prompt_re$" { pass $test set gotit 1 } |