From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by sourceware.org (Postfix) with ESMTPS id C1B553858D1E for ; Sat, 31 Dec 2022 06:36:19 +0000 (GMT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id F10321F8B8 for ; Sat, 31 Dec 2022 06:36:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1672468578; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=NxLWezMnVNtpu9T/KZiq0XW84JD5jIsxTPZFq0m5Fgw=; b=O7xyKkN7on8qRXLu5CM2DZ46BqgDUr6JgWX8jHyS8geaizgWvEecsZxNpQFhC6eBR4tyLh 3u2tZZr093UUgmnJO6Q2syvusg98UEDi0uG33qyVBL0f87keTh4H7kb3yqsfffUZ87gAMC g+VM805G6lIXtF8s7i9xRUnV8Dr72eo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1672468578; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=NxLWezMnVNtpu9T/KZiq0XW84JD5jIsxTPZFq0m5Fgw=; b=i9LSSlPkPab51qAHDbV/UdOnEKl2SfOvaCJFQ6qDMJRXNd0vQT+G08G1z2XNvozE+VA1ul yhZmnXf7cZL3BbDg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id DC79E1330E for ; Sat, 31 Dec 2022 06:36:18 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id EUCcNGLYr2NhTAAAMHmgww (envelope-from ) for ; Sat, 31 Dec 2022 06:36:18 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [pushed] [gdb/testsuite] Fix gdb.base/print-symbol-loading.exp on ubuntu 22.04.1 Date: Sat, 31 Dec 2022 07:36:18 +0100 Message-Id: <20221231063618.30171-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_NUMSUBJECT,SPF_HELO_NONE,SPF_PASS,TXREP,URIBL_BLACK autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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 --- gdb/testsuite/gdb.base/print-symbol-loading.exp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/gdb.base/print-symbol-loading.exp b/gdb/testsuite/gdb.base/print-symbol-loading.exp index 6de1a748d28..82dc2a1ccf6 100644 --- a/gdb/testsuite/gdb.base/print-symbol-loading.exp +++ b/gdb/testsuite/gdb.base/print-symbol-loading.exp @@ -105,6 +105,10 @@ proc test_load_shlib { print_symbol_loading } { } gdb_test_no_output "set print symbol-loading $print_symbol_loading" 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} { "off" { set cmd "sharedlibrary .*" @@ -113,7 +117,7 @@ proc test_load_shlib { print_symbol_loading } { -re "^$cmd_regex\r\n$gdb_prompt $" { 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 } } base-commit: 32c960fac8d4d52d3afca088b3419e3e658d322e -- 2.35.3