From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id A2D663858C60 for ; Thu, 25 Jan 2024 11:02:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A2D663858C60 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 A2D663858C60 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706180544; cv=none; b=k4BuM8YsmkFAsYhyvqfeg2+Ffzi3MsvFcENuNmM0fBqkIi9TbAWqhwcs9ISXqYAkKDWJcA+GQkoeLCYVqCok2wjl7D8WvVZ426F6fL/+G03vMuqfMaVjTySPuLCtLcd38g37i+WIhvHnRoAhMYDKfSIMUbELHggSHQWpd/FTUlc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706180544; c=relaxed/simple; bh=YyToV9WkKUHwY/nY6EHBUhxEUipy3n49lnFl2YApeUE=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=xq3A2co4kac5xWkqNqXzFbG3ik/x/aB7m1bnwtLy0cJ7O0I3R59owCnqOhn2ZIrECUIXDRmryzz7RwzJBrfcwAOJd7lgy0WziB6nSPBcdD43/hfqcekHcR/iayYJmPotO72BHsxrqaa25V2MfwFVn9pFHeWaZtgr039yJYzdMy0= 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-out1.suse.de (Postfix) with ESMTPS id ACD9521E21 for ; Thu, 25 Jan 2024 11:02:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1706180541; 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=ibClMl+kPhOwUKEj7ilLGToGZdF6ImXRe9B/bpnWNoc=; b=R3nzVSuYXrmi0UtRmF6n/c0ClnK7rrfi2ALYb3W+69Hw7GGOKhczWLFXwfBNA/KAE4Ldqr 2xSGnoZGhLWSYOa/0/RC23JuKIO41njOf3wnFn12kZM10Wh8UY/VHugmZ0TgOVDsR76l6H CMtBhD+cdPLb+rJvb1iAizlIzT+yUO0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1706180541; 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=ibClMl+kPhOwUKEj7ilLGToGZdF6ImXRe9B/bpnWNoc=; b=hqTArYYdEYAVUOrJnXkQIIXrct2eAvWIKwgviUC0rB5DWfPKhbi8ZWBBlrROaZC3fzXtQO ZeRtKaVoezyTKvCg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1706180541; 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=ibClMl+kPhOwUKEj7ilLGToGZdF6ImXRe9B/bpnWNoc=; b=R3nzVSuYXrmi0UtRmF6n/c0ClnK7rrfi2ALYb3W+69Hw7GGOKhczWLFXwfBNA/KAE4Ldqr 2xSGnoZGhLWSYOa/0/RC23JuKIO41njOf3wnFn12kZM10Wh8UY/VHugmZ0TgOVDsR76l6H CMtBhD+cdPLb+rJvb1iAizlIzT+yUO0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1706180541; 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=ibClMl+kPhOwUKEj7ilLGToGZdF6ImXRe9B/bpnWNoc=; b=hqTArYYdEYAVUOrJnXkQIIXrct2eAvWIKwgviUC0rB5DWfPKhbi8ZWBBlrROaZC3fzXtQO ZeRtKaVoezyTKvCg== 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 980DA134C3 for ; Thu, 25 Jan 2024 11:02:21 +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 MpraI70/smV/cQAAD6G6ig (envelope-from ) for ; Thu, 25 Jan 2024 11:02:21 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH] [gdb/testsuite] Fix regexp in vgdb_start Date: Thu, 25 Jan 2024 12:03:18 +0100 Message-Id: <20240125110318.20163-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Authentication-Results: smtp-out1.suse.de; none X-Spam-Level: X-Spam-Score: 0.70 X-Spamd-Result: default: False [0.70 / 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.20)[-1.000]; 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(-3.00)[100.00%] 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,T_SCC_BODY_TEXT_LINE 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 Fedora 39 aarch64 I run into: ... (gdb) target remote | vgdb --wait=2 --max-invoke-ms=2500 --pid=2114437^M Remote debugging using | vgdb --wait=2 --max-invoke-ms=2500 --pid=2114437^M relaying data between gdb and process 2114437^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 _start () at ../sysdeps/aarch64/dl-start.S:22^M warning: 22 ../sysdeps/aarch64/dl-start.S: No such file or directory^M (gdb) FAIL: gdb.base/valgrind-infcall.exp: target remote for vgdb ... For contrast, on openSUSE Leap 15.4 x86_64 I have: ... (gdb) target remote | vgdb --wait=2 --max-invoke-ms=2500 --pid=18797^M Remote debugging using | vgdb --wait=2 --max-invoke-ms=2500 --pid=18797^M relaying data between gdb and process 18797^M warning: remote target does not support file transfer, \ attempting to access files from local filesystem.^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 0x0000000004002550 in _start () from /lib64/ld-linux-x86-64.so.2^M (gdb) PASS: gdb.base/valgrind-infcall.exp: target remote for vgdb ... The fail happens in vgdb_start because the regexp only matches the "in _start ()" variant, not the "_start () at": ... gdb_test "$vgdbcmd" " in \\.?_start .*" "target remote for vgdb" ... Which variant you get is determined by presence of debug info. Fix this by also matching the "_start () at" variant. Tested aarch64-linux and x86_64-linux. --- gdb/testsuite/lib/valgrind.exp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/lib/valgrind.exp b/gdb/testsuite/lib/valgrind.exp index 11d92fff26a..2f2d58844f4 100644 --- a/gdb/testsuite/lib/valgrind.exp +++ b/gdb/testsuite/lib/valgrind.exp @@ -92,7 +92,10 @@ proc vgdb_start { {active_at_startup 1} } { set vgdbcmd "target remote | vgdb --wait=2 --max-invoke-ms=2500 --pid=$vgdbpid" if { $active_at_startup } { - gdb_test "$vgdbcmd" " in \\.?_start .*" "target remote for vgdb" + set start_re1 " in \\.?_start " + set start_re2 "\\.?_start \\(\\) at " + gdb_test "$vgdbcmd" "($start_re1|$start_re2).*" \ + "target remote for vgdb" } else { # Let $binfile run a bit before attaching. This is a bit of a hack, # in that it lets test-case valgrind-infcall-2.exp run to the point of base-commit: 726f209eb1b05842d816eac8b0b8f9c7f6cd9fbc -- 2.35.3