[gdb/testsuite] Fix FAILs due to verbose in foll-fork.exp

When running test-case gdb.base/foll-fork.exp, I see:
...
(gdb) catch fork^M
Catchpoint 2 (fork)^M
Reading in symbols for ../sysdeps/x86/libc-start.c...^M
(gdb) FAIL: gdb.base/foll-fork.exp: explicit child follow, set catch fork
...

The problem is that the test regexp does not expect the "Reading in symbols"
message:
...
    gdb_test "catch fork" "Catchpoint \[0-9\]* \\(fork\\)" \
        "explicit child follow, set catch fork"
...
which is generated due to the verbose setting.

Fix this by allowing the message in the regexp.

Tested on x86_64-linux.

gdb/testsuite/ChangeLog:

2020-03-11  Tom de Vries  <tdevries@suse.de>

	* gdb.base/foll-fork.exp: Allow "Reading in symbols" messages.
This commit is contained in:
Tom de Vries 2020-03-11 14:58:59 +01:00
parent 1c6c46a012
commit 7462c383f9
2 changed files with 12 additions and 2 deletions

View File

@ -1,3 +1,7 @@
2020-03-11 Tom de Vries <tdevries@suse.de>
* gdb.base/foll-fork.exp: Allow "Reading in symbols" messages.
2020-03-11 Tom de Vries <tdevries@suse.de>
* gdb.base/break-interp.exp: Limit verbose scope.

View File

@ -179,13 +179,17 @@ proc test_follow_fork { who detach cmd } {
}
}
set reading_in_symbols_re {(?:\r\nReading in symbols for [^\r\n]*)?}
proc catch_fork_child_follow {} {
global gdb_prompt
global srcfile
global reading_in_symbols_re
set bp_after_fork [gdb_get_line_number "set breakpoint here"]
gdb_test "catch fork" "Catchpoint \[0-9\]* \\(fork\\)" \
gdb_test "catch fork" \
"Catchpoint \[0-9\]* \\(fork\\)$reading_in_symbols_re" \
"explicit child follow, set catch fork"
# Verify that the catchpoint is mentioned in an "info breakpoints",
@ -285,10 +289,12 @@ proc catch_fork_unpatch_child {} {
proc tcatch_fork_parent_follow {} {
global gdb_prompt
global srcfile
global reading_in_symbols_re
set bp_after_fork [gdb_get_line_number "set breakpoint here"]
gdb_test "catch fork" "Catchpoint \[0-9\]* \\(fork\\)" \
gdb_test "catch fork" \
"Catchpoint \[0-9\]* \\(fork\\)$reading_in_symbols_re" \
"explicit parent follow, set tcatch fork"
# ??rehrauer: I don't yet know how to get the id of the tcatch