From patchwork Tue Mar 26 08:01:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 87651 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1C83C385840E for ; Tue, 26 Mar 2024 08:02:12 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2a07:de40:b251:101:10:150:64:2]) by sourceware.org (Postfix) with ESMTPS id 6E5A23858D38 for ; Tue, 26 Mar 2024 08:01:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6E5A23858D38 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 6E5A23858D38 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:2 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711440104; cv=none; b=p9vJM4gEQmiNiLdTdFqe2OSvC6KstcJm3iOvDmfWurKEAbSmFWe4ufBimRpsWuCNXEky1027JsPrzvOhznYc8SocyF+pDaJUqrnXKyWRehNY9qPaRzahq9EV75/oQlVSFJWI1WHfNqrzCwMwO7deJh2NGRHBmdd30mUqL3Uqb20= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711440104; c=relaxed/simple; bh=ensvKrRLR+vb7W/CfsXaFBF1gBt7BXj+PlNpwRadcuU=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=c4WAnPGdeujgwAu2/9Ig29NFIFXJJmRZAEh07X3F4ZrMVk8hpbIPxafuslAFEHCxlimR0xAaKXNLFTFEYYm7PbJ279bBun5gaBWA6A7LFHnoaUoQGf34lAKIyt+X1dji0Rn8ehPaxSyxhxqFKVYfG09SYVexRQ/Yr6fEKhNaGJg= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 73BF35D2C9 for ; Tue, 26 Mar 2024 08:01:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1711440094; 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=SUxhZ8OlD0BsHLIAbkpSVndymjN97DsDYD+UlgK9Rb0=; b=Go+Z64paUxx8iP4sYGAZRrrl8SPGR3+n2wCKQvHxSJC7JYF/IsL9ssPUAhfhae0rwRF3NP zgk9fY5VcxTHgzitWkM95NSAtzMOZh5UzxffgMoeYHpsbtHvpDY8zobfLTRQRfDsDLW5wU ckGOcc5s3SqZmdTMRZMVfcZpokPKFN8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1711440094; 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=SUxhZ8OlD0BsHLIAbkpSVndymjN97DsDYD+UlgK9Rb0=; b=BpMcDExc7yxwny/OCsNQNBvRDbl875qLtMi6fqU8iiz2yEjOVCDw3xwnWaRoeDD0WFI5yT QWiosJsgUxO7sEBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1711440094; 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=SUxhZ8OlD0BsHLIAbkpSVndymjN97DsDYD+UlgK9Rb0=; b=Go+Z64paUxx8iP4sYGAZRrrl8SPGR3+n2wCKQvHxSJC7JYF/IsL9ssPUAhfhae0rwRF3NP zgk9fY5VcxTHgzitWkM95NSAtzMOZh5UzxffgMoeYHpsbtHvpDY8zobfLTRQRfDsDLW5wU ckGOcc5s3SqZmdTMRZMVfcZpokPKFN8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1711440094; 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=SUxhZ8OlD0BsHLIAbkpSVndymjN97DsDYD+UlgK9Rb0=; b=BpMcDExc7yxwny/OCsNQNBvRDbl875qLtMi6fqU8iiz2yEjOVCDw3xwnWaRoeDD0WFI5yT QWiosJsgUxO7sEBA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 658D5138A1 for ; Tue, 26 Mar 2024 08:01:34 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id FziZF96AAmbnVwAAD6G6ig (envelope-from ) for ; Tue, 26 Mar 2024 08:01:34 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH] [gdb/testsuite] Fix valgrind tests on debian Date: Tue, 26 Mar 2024 09:01:29 +0100 Message-Id: <20240326080129.2341-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Spam-Score: 3.09 X-Spamd-Result: default: False [3.09 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; BROKEN_CONTENT_TYPE(1.50)[]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_NONE(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.04)[-0.219]; MID_CONTAINS_FROM(1.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-0.77)[84.35%] Authentication-Results: smtp-out2.suse.de; none X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org On debian 12, I run into: ... (gdb) target remote | vgdb --wait=2 --max-invoke-ms=2500 --pid=618591^M Remote debugging using | vgdb --wait=2 --max-invoke-ms=2500 --pid=618591^M relaying data between gdb and process 618591^M warning: remote target does not support file transfer, \ attempting to access files from local filesystem.^M Reading symbols from /lib/ld-linux-aarch64.so.1...^M (No debugging symbols found in /lib/ld-linux-aarch64.so.1)^M 0x000000000401a980 in ?? () from /lib/ld-linux-aarch64.so.1^M (gdb) FAIL: gdb.base/valgrind-infcall.exp: target remote for vgdb ... The problem is that we're expecting to match either of these regexps: ... set start_re1 " in \\.?_start " set start_re2 "\\.?_start \\(\\) at " ... but there are no dwarf or elf symbols present. Fix this by also allowing: ... set start_re3 "$::hex in \\?\\? \\(\\) from " ... Tested on aarch64-linux. --- gdb/testsuite/lib/valgrind.exp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) base-commit: 874f4887f0361e953f7098459ae60a5f894d362a diff --git a/gdb/testsuite/lib/valgrind.exp b/gdb/testsuite/lib/valgrind.exp index 2f2d58844f4..c952e929bae 100644 --- a/gdb/testsuite/lib/valgrind.exp +++ b/gdb/testsuite/lib/valgrind.exp @@ -94,7 +94,8 @@ proc vgdb_start { {active_at_startup 1} } { if { $active_at_startup } { set start_re1 " in \\.?_start " set start_re2 "\\.?_start \\(\\) at " - gdb_test "$vgdbcmd" "($start_re1|$start_re2).*" \ + set start_re3 "$::hex in \\?\\? \\(\\) from " + gdb_test "$vgdbcmd" "($start_re1|$start_re2|$start_re3).*" \ "target remote for vgdb" } else { # Let $binfile run a bit before attaching. This is a bit of a hack,