diff options
author | Tom de Vries <tdevries@suse.de> | 2019-07-29 14:11:13 +0200 |
---|---|---|
committer | Tom de Vries <tdevries@suse.de> | 2019-07-29 14:11:13 +0200 |
commit | 2d274232f3e693d54f8dd561de73810d1a03ddf7 (patch) | |
tree | 1ae61ef4ca29ebfd442f39fcb2128cce81af831c /gdb | |
parent | 9197cd8b52aa41a04b883d83df863ecb5afc5d35 (diff) | |
download | gdb-2d274232f3e693d54f8dd561de73810d1a03ddf7.zip gdb-2d274232f3e693d54f8dd561de73810d1a03ddf7.tar.gz gdb-2d274232f3e693d54f8dd561de73810d1a03ddf7.tar.bz2 |
[gdb/testsuite] Fix mi-catch-cpp-exceptions.exp and mi-nonstop.exp with check-read1
With check-read1 we get:
...
FAIL: gdb.mi/mi-catch-cpp-exceptions.exp: check for stap probe in libstdc++
FAIL: gdb.mi/mi-nonstop.exp: probe for target remote
...
In both cases this is due to using gdb_test_multiple (which expects $gdb_prompt
by default) in combination with gdb using $gdb_mi_prompt, similar to the
problem fixed by commit d17725d72f "Don't expect gdb_prompt in
mi_skip_python_test".
Fix this by adding the $prompt_regexp argument to the gdb_test_multiple calls.
gdb/testsuite/ChangeLog:
2019-07-29 Tom de Vries <tdevries@suse.de>
* lib/gdb.exp (skip_libstdcxx_probe_tests_prompt, gdb_is_target_1):
Pass prompt_regexp parameter to gdb_test_multiple calls.
Diffstat (limited to 'gdb')
-rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
-rw-r--r-- | gdb/testsuite/lib/gdb.exp | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index f18f0ab..96ced4e 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2019-07-29 Tom de Vries <tdevries@suse.de> + * lib/gdb.exp (skip_libstdcxx_probe_tests_prompt, gdb_is_target_1): + Pass prompt_regexp parameter to gdb_test_multiple calls. + +2019-07-29 Tom de Vries <tdevries@suse.de> + * gdb.base/maint.exp: Use "\r\n" instead of "\[\r\n\]+" in "maint print registers" regexps. diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 4c7d3b5..14b9601 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -3120,7 +3120,7 @@ proc skip_libstdcxx_probe_tests_prompt { prompt_regexp } { } -re "\r\n$prompt_regexp" { } - } + } "$prompt_regexp" return $ok } @@ -3167,7 +3167,7 @@ proc gdb_is_target_1 { target_name target_stack_regexp prompt_regexp } { -re "$prompt_regexp" { pass $test } - } + } "$prompt_regexp" return 0 } |