[pushed,gdb/testsuite] Fix gdb.debuginfod/fetch_src_and_symbols.exp with check-read1
Commit Message
With test-case gdb.debuginfod/fetch_src_and_symbols.exp and check-read1, I run
into:
...
(gdb) FAIL: gdb.debuginfod/fetch_src_and_symbols.exp: local_url: \
file fetch_src_and_symbols (got interactive prompt)
...
The problem is that this output:
...
Enable debuginfod for this session? (y or [n]) y^M
...
is matched using regexp "Enable debuginfod?.*" with matches only the first two
words of the output, after which an implicit clause in gdb_test_multiple triggers
on the second part containing the interactive prompt.
Fix this by included the interactive prompt in the regexp.
Tested on x86_64-linux.
---
gdb/testsuite/gdb.debuginfod/fetch_src_and_symbols.exp | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
base-commit: 9c1c98cc632a7f4721e0b19edcb8f6bcd9347942
@@ -210,7 +210,10 @@ proc_with_prefix local_url { } {
# GDB should now find the symbol and source files.
clean_restart
- gdb_test "file $binfile" "" "file [file tail $binfile]" "Enable debuginfod?.*" "y"
+ set enable_debuginfod_question \
+ "Enable debuginfod for this session. \\(y or \\\[n\\\]\\) "
+ gdb_test "file $binfile" "" "file [file tail $binfile]" \
+ $enable_debuginfod_question "y"
gdb_test_no_output "set substitute-path $outputdir /dev/null" \
"set substitute-path"
gdb_test "br main" "Breakpoint 1 at.*file.*"
@@ -219,14 +222,14 @@ proc_with_prefix local_url { } {
# GDB should now find the executable file.
clean_restart
gdb_test "core $::corefile" ".*return 0.*" "file [file tail $::corefile]" \
- "Enable debuginfod?.*" "y"
+ $enable_debuginfod_question "y"
# GDB should now find the debugaltlink file.
clean_restart
gdb_test "file ${binfile}_alt.o" \
".*Downloading.*separate debug info.*" \
"file [file tail ${binfile}_alt.o]" \
- ".*Enable debuginfod?.*" "y"
+ $enable_debuginfod_question "y"
# Configure debuginfod with commands.
unsetenv DEBUGINFOD_URLS