Message ID | 20240125110720.21486-1-tdevries@suse.de |
---|---|
State | Committed |
Headers |
Return-Path: <gdb-patches-bounces+patchwork=sourceware.org@sourceware.org> 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 92AF03858287 for <patchwork@sourceware.org>; Thu, 25 Jan 2024 11:06:31 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2a07:de40:b251:101:10:150:64:1]) by sourceware.org (Postfix) with ESMTPS id DB4673858D28 for <gdb-patches@sourceware.org>; Thu, 25 Jan 2024 11:06:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DB4673858D28 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 DB4673858D28 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706180769; cv=none; b=hq6EJXlKoPYuu3aJGP0jKVtFx6YRAaQWjwkbfznfY/maf5PsRDfd1Iz6FSFUxfb4qx3ExUOS4MDpkTNXRzYeL55tJvL2BOQ84fWrvo2/pkBZIofBRyeEIDkuUR6pfWNApcb26sTfL5J13I7SjZnYHVT/RPhjVHVaKqvhubwPM/s= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706180769; c=relaxed/simple; bh=voMRJ71HZChxwcRork7BQQrqVa4UHbBk2wZjMocoSoU=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=BQLwioHPAMqEQkmJl+FYiIHDuQ0yw4SyU1O7VElHO3WI+1s6VvJN9nT8lQSKnsRhcQ66T7NL+wDx4JjxYcOnVQcQ9MBpqVONjYfU4WpoSHu3VVQzqoLzfWt1vNAkY6f6riJM0O84cDUaNpucav0vdmyp9ZVA/ik5pPxuoBwH+EM= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104: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 8B76C21ED3 for <gdb-patches@sourceware.org>; Thu, 25 Jan 2024 11:06:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1706180764; 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=5CqxGoRpBQNtmQEFADY3/Fd3xlqicWxj51/rNml3W7w=; b=WJvB7TOewPa9bllSyO4Wcep0PfXiBeyrvV3tiHK7MVYE87fVlAFYmHQ4VnJUW2IBIMLFxI TeehKG29KZdzFPAfF/c48l4YSLZU/jKdqxuZCiXZB1YbfhsA4U1dLgElZIqfU0lmKmu65o hyqm/WTXwi64ZMZ5o6Qye/fHbalJOcs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1706180764; 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=5CqxGoRpBQNtmQEFADY3/Fd3xlqicWxj51/rNml3W7w=; b=KbrK2mioYj2XNeHFy5zDmYM1CkqdRBvcNV6eJPlLMfhtradSF99IpMxks7iG5wRakMB5Md BXbHZxQMxxBT5EDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1706180764; 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=5CqxGoRpBQNtmQEFADY3/Fd3xlqicWxj51/rNml3W7w=; b=WJvB7TOewPa9bllSyO4Wcep0PfXiBeyrvV3tiHK7MVYE87fVlAFYmHQ4VnJUW2IBIMLFxI TeehKG29KZdzFPAfF/c48l4YSLZU/jKdqxuZCiXZB1YbfhsA4U1dLgElZIqfU0lmKmu65o hyqm/WTXwi64ZMZ5o6Qye/fHbalJOcs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1706180764; 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=5CqxGoRpBQNtmQEFADY3/Fd3xlqicWxj51/rNml3W7w=; b=KbrK2mioYj2XNeHFy5zDmYM1CkqdRBvcNV6eJPlLMfhtradSF99IpMxks7iG5wRakMB5Md BXbHZxQMxxBT5EDQ== 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 7407E134C3 for <gdb-patches@sourceware.org>; Thu, 25 Jan 2024 11:06:04 +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 48PLGpxAsmWbcgAAD6G6ig (envelope-from <tdevries@suse.de>) for <gdb-patches@sourceware.org>; Thu, 25 Jan 2024 11:06:04 +0000 From: Tom de Vries <tdevries@suse.de> To: gdb-patches@sourceware.org Subject: [PATCH] [gdb/testsuite] Fix gdb.base/eh_return.exp Date: Thu, 25 Jan 2024 12:07:20 +0100 Message-Id: <20240125110720.21486-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: + Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=WJvB7TOe; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=KbrK2mio X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [1.49 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FROM_HAS_DN(0.00)[]; DWL_DNSWL_MED(-2.00)[suse.de:dkim]; 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]; DKIM_TRACE(0.00)[suse.de:+]; MX_GOOD(-0.01)[]; MID_CONTAINS_FROM(1.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; NEURAL_HAM_SHORT(-0.20)[-1.000]; RCVD_TLS_ALL(0.00)[] X-Spam-Score: 1.49 X-Rspamd-Queue-Id: 8B76C21ED3 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list <gdb-patches.sourceware.org> List-Unsubscribe: <https://sourceware.org/mailman/options/gdb-patches>, <mailto:gdb-patches-request@sourceware.org?subject=unsubscribe> List-Archive: <https://sourceware.org/pipermail/gdb-patches/> List-Post: <mailto:gdb-patches@sourceware.org> List-Help: <mailto:gdb-patches-request@sourceware.org?subject=help> List-Subscribe: <https://sourceware.org/mailman/listinfo/gdb-patches>, <mailto:gdb-patches-request@sourceware.org?subject=subscribe> Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org |
Series |
[gdb/testsuite] Fix gdb.base/eh_return.exp
|
|
Checks
Context | Check | Description |
---|---|---|
linaro-tcwg-bot/tcwg_gdb_build--master-aarch64 | success | Testing passed |
linaro-tcwg-bot/tcwg_gdb_build--master-arm | success | Testing passed |
linaro-tcwg-bot/tcwg_gdb_check--master-aarch64 | success | Testing passed |
linaro-tcwg-bot/tcwg_gdb_check--master-arm | success | Testing passed |
Commit Message
Tom de Vries
Jan. 25, 2024, 11:07 a.m. UTC
On Fedora rawhide aarch64, I run into: ... (gdb) PASS: gdb.base/eh_return.exp: set breakpoint on address run ^M Starting program: eh_return ^M [Thread debugging using libthread_db enabled]^M Using host libthread_db library "/lib64/libthread_db.so.1".^M [Inferior 1 (process 1113051) exited normally]^M (gdb) FAIL: gdb.base/eh_return.exp: hit breakpoint (the program exited) ... This happens as follows: the test-case sets a breakpoint on the last instruction of function eh2: ... (gdb) break *0x00000000004103ec^M ... and expects to hit the breakpoint, but instead the "br x6" is taken: ... 0x00000000004103e0 <+176>: cbz x4, 0x4103ec <eh2+188>^M 0x00000000004103e4 <+180>: add sp, sp, x5^M 0x00000000004103e8 <+184>: br x6^M 0x00000000004103ec <+188>: ret^M ... In contrast, with fedora f39 we have: ... 0x00000000004103bc <+156>: ldp x2, x3, [sp, #48]^M 0x00000000004103c0 <+160>: ldp x29, x30, [sp, #16]^M 0x00000000004103c4 <+164>: add sp, sp, #0x50^M 0x00000000004103c8 <+168>: add sp, sp, x4^M 0x00000000004103cc <+172>: ret^M ... and the breakpoint is reached. Fix this by detecting that the breakpoint is not hit, and declaring the test unsupported. Tested on aarch64-linux. PR testsuite/31291 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31291 --- gdb/testsuite/gdb.base/eh_return.exp | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) base-commit: 726f209eb1b05842d816eac8b0b8f9c7f6cd9fbc
Comments
>>>>> "Tom" == Tom de Vries <tdevries@suse.de> writes:
Tom> +gdb_expect {
Tom> + -re "Breakpoint .*\r\n$gdb_prompt $" {
Tom> + pass $test
Tom> + }
Tom> + -re "$inferior_exited_re normally.*\r\n$gdb_prompt $" {
Tom> + unsupported $test
Tom> + }
Tom> + -re "\r\n$gdb_prompt $" {
I don't really know, but should these use -wrap instead of manually
matching the prompt regexp?
Tom
On 1/25/24 15:50, Tom Tromey wrote: >>>>>> "Tom" == Tom de Vries <tdevries@suse.de> writes: > > Tom> +gdb_expect { > Tom> + -re "Breakpoint .*\r\n$gdb_prompt $" { > Tom> + pass $test > Tom> + } > Tom> + -re "$inferior_exited_re normally.*\r\n$gdb_prompt $" { > Tom> + unsupported $test > Tom> + } > Tom> + -re "\r\n$gdb_prompt $" { > > I don't really know, but should these use -wrap instead of manually > matching the prompt regexp? -wrap is implemented in gdb_test_multiple, this uses gdb_expect because otherwise the builtin handling of inferior_exited_re triggers. Thanks, - Tom
>>>>> "Tom" == Tom de Vries <tdevries@suse.de> writes: Tom> On 1/25/24 15:50, Tom Tromey wrote: >>>>>>> "Tom" == Tom de Vries <tdevries@suse.de> writes: Tom> +gdb_expect { Tom> + -re "Breakpoint .*\r\n$gdb_prompt $" { Tom> + pass $test Tom> + } Tom> + -re "$inferior_exited_re normally.*\r\n$gdb_prompt $" { Tom> + unsupported $test Tom> + } Tom> + -re "\r\n$gdb_prompt $" { >> I don't really know, but should these use -wrap instead of manually >> matching the prompt regexp? Tom> -wrap is implemented in gdb_test_multiple, this uses gdb_expect Tom> because otherwise the builtin handling of inferior_exited_re Tom> triggers. Oh oops. Thanks. I guess you could use -early maybe? But TBH I think this is ok. Approved-By: Tom Tromey <tom@tromey.com> Tom
On 1/25/24 15:54, Tom Tromey wrote: >>>>>> "Tom" == Tom de Vries <tdevries@suse.de> writes: > > Tom> On 1/25/24 15:50, Tom Tromey wrote: >>>>>>>> "Tom" == Tom de Vries <tdevries@suse.de> writes: > Tom> +gdb_expect { > Tom> + -re "Breakpoint .*\r\n$gdb_prompt $" { > Tom> + pass $test > Tom> + } > Tom> + -re "$inferior_exited_re normally.*\r\n$gdb_prompt $" { > Tom> + unsupported $test > Tom> + } > Tom> + -re "\r\n$gdb_prompt $" { >>> I don't really know, but should these use -wrap instead of manually >>> matching the prompt regexp? > > Tom> -wrap is implemented in gdb_test_multiple, this uses gdb_expect > Tom> because otherwise the builtin handling of inferior_exited_re > Tom> triggers. > > Oh oops. Thanks. > > I guess you could use -early maybe? But TBH I think this is ok. Yeah, I tried that but I didn't manage to make that work. I considered debugging that, but decided I didn't have the time, so I went with this instead. Thanks for the review, committed. - Tom > Approved-By: Tom Tromey <tom@tromey.com> > > Tom
diff --git a/gdb/testsuite/gdb.base/eh_return.exp b/gdb/testsuite/gdb.base/eh_return.exp index b055058066b..9fefc890b28 100644 --- a/gdb/testsuite/gdb.base/eh_return.exp +++ b/gdb/testsuite/gdb.base/eh_return.exp @@ -79,4 +79,18 @@ gdb_assert [gdb_breakpoint "*$address" no-message] "set breakpoint on address" # breakpoint, so instead, run to the breakpoint. gdb_run_cmd -gdb_test "" "Breakpoint .*" "hit breakpoint" +set test "hit breakpoint" +gdb_expect { + -re "Breakpoint .*\r\n$gdb_prompt $" { + pass $test + } + -re "$inferior_exited_re normally.*\r\n$gdb_prompt $" { + unsupported $test + } + -re "\r\n$gdb_prompt $" { + fail $test + } + default { + fail $test + } +}