diff options
author | Tom de Vries <tdevries@suse.de> | 2022-05-01 18:06:44 +0200 |
---|---|---|
committer | Tom de Vries <tdevries@suse.de> | 2022-05-01 18:06:44 +0200 |
commit | 94afbc7b1b27f03974133b3d620470e9725a21df (patch) | |
tree | 7b8c74622b8ea3b1f346948d5dabe9d5360678d7 /gdb | |
parent | e9c5fe2f40e7da0f104624ee81c9720a7956e64c (diff) | |
download | fsf-binutils-gdb-94afbc7b1b27f03974133b3d620470e9725a21df.zip fsf-binutils-gdb-94afbc7b1b27f03974133b3d620470e9725a21df.tar.gz fsf-binutils-gdb-94afbc7b1b27f03974133b3d620470e9725a21df.tar.bz2 |
[gdb/testsuite] Fix gdb.multi/attach-no-multi-process.exp with check-readmore
When running test-case gdb.multi/attach-no-multi-process.exp with
check-readmore, I get:
...
(gdb) attach 13411^M
Attaching to Remote target^M
No unwaited-for children left.^M
(gdb) Reading symbols from attach-no-multi-process...^M
Reading symbols from /lib64/libm.so.6...^M
(No debugging symbols found in /lib64/libm.so.6)^M
Reading symbols from /lib64/libc.so.6...^M
(No debugging symbols found in /lib64/libc.so.6)^M
Reading symbols from /lib64/ld-linux-x86-64.so.2...^M
(No debugging symbols found in /lib64/ld-linux-x86-64.so.2)^M
0x00007f5df1fffc8a in clock_nanosleep@GLIBC_2.2.5 () from /lib64/libc.so.6^M
FAIL: gdb.multi/attach-no-multi-process.exp: target_non_stop=off: \
attach to the program via remote (timeout)
...
The problem is that the attach output is matched using gdb_test, which uses
the '$gdb_prompt $' regexp, and this does not handle the case that '(gdb) ' is
not the last available output.
Fix this by using a gdb_test_multiple instead with a '$gdb_prompt ' regexp, so
without the '$' anchor.
Tested on x86_64-linux with native, check-read1 and check-readmore.
Diffstat (limited to 'gdb')
-rw-r--r-- | gdb/testsuite/gdb.multi/attach-no-multi-process.exp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gdb/testsuite/gdb.multi/attach-no-multi-process.exp b/gdb/testsuite/gdb.multi/attach-no-multi-process.exp index 081579f..66b210f 100644 --- a/gdb/testsuite/gdb.multi/attach-no-multi-process.exp +++ b/gdb/testsuite/gdb.multi/attach-no-multi-process.exp @@ -32,6 +32,7 @@ if {[build_executable "build" $testfile $srcfile {debug}] == -1} { proc test {target_non_stop} { global binfile + global gdb_prompt save_vars { ::GDBFLAGS } { # If GDB and GDBserver are both running locally, set the sysroot to avoid @@ -64,9 +65,11 @@ proc test {target_non_stop} { set spawn_id_list [spawn_wait_for_attach [list $binfile]] set test_spawn_id [lindex $spawn_id_list 0] set testpid [spawn_id_get_pid $test_spawn_id] - gdb_test "attach $testpid" \ - "Attaching to Remote target.*" \ - "attach to the program via remote" + gdb_test_multiple "attach $testpid" "attach to the program via remote" { + -re "Attaching to Remote target.*\[\r\n\]+$gdb_prompt " { + pass $gdb_test_name + } + } # Check that we have two threads. Bad GDB duplicated the # thread coming from the remote when target-non-stop is off; |