Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

[gdb/testsuite] Fix gdb.base/print-symbol-loading.exp on ubuntu 22.04.1

Browse Source 
On ubuntu 22.04.1 x86_64, I run into:
...
(gdb) PASS: gdb.base/print-symbol-loading.exp: shlib off: \
  set print symbol-loading off
sharedlibrary .*^M
Symbols already loaded for /lib/x86_64-linux-gnu/libc.so.6^M
Symbols already loaded for /lib/x86_64-linux-gnu/libpthread.so.0^M
(gdb) FAIL: gdb.base/print-symbol-loading.exp: shlib off: load shared-lib
...

The test-case expects the libc.so line, but not the libpthread.so line.

However, we have:
...
$ ldd /lib/x86_64-linux-gnu/libc.so.6
	linux-vdso.so.1 (0x00007ffd7f7e7000)
	libgtk3-nocsd.so.0 => /lib/x86_64-linux-gnu/libgtk3-nocsd.so.0 (0x00007f4468c00000)
	/lib64/ld-linux-x86-64.so.2 (0x00007f4469193000)
	libdl.so.2 => /lib/x86_64-linux-gnu/libdl.so.2 (0x00007f4468f3e000)
	libpthread.so.0 => /lib/x86_64-linux-gnu/libpthread.so.0 (0x00007f4468f39000)
...
so it's not unexpected that libpthread.so is loaded if libc.so is loaded.

Fix this by accepting the libpthread.so line.

Tested on x86_64-linux.

PR testsuite/29919
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=29919
This commit is contained in:
Tom de Vries
2022-12-31 07:35:56 +01:00
parent 32c960fac8
commit 38ef8cc8e8
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/testsuite/gdb.base/print-symbol-loading.exp
View File

@@ -105,6 +105,10 @@ proc test_load_shlib { print_symbol_loading } {
} }
gdb_test_no_output "set print symbol-loading $print_symbol_loading" gdb_test_no_output "set print symbol-loading $print_symbol_loading"
set test_name "load shared-lib" set test_name "load shared-lib"
set libc_re \
[multi_line \
"Symbols already loaded for\[^\r\n\]*\\/libc\\.\[^\r\n\]*(" \
"Symbols already loaded for\[^\r\n\]*\\/libpthread\\.\[^\r\n\]*)?"]
switch ${print_symbol_loading} { switch ${print_symbol_loading} {
"off" { "off" {
set cmd "sharedlibrary .*" set cmd "sharedlibrary .*"
@@ -113,7 +117,7 @@ proc test_load_shlib { print_symbol_loading } {
-re "^$cmd_regex\r\n$gdb_prompt $" { -re "^$cmd_regex\r\n$gdb_prompt $" {
pass $test_name pass $test_name
} }
-re "^$cmd_regex\r\nSymbols already loaded for\[^\r\n\]*\\/libc\\.\[^\r\n\]*\r\n$gdb_prompt $" { -re "^$cmd_regex\r\n$libc_re\r\n$gdb_prompt $" {
pass $test_name pass $test_name
} }
} }