From patchwork Tue Mar 19 07:38:12 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: 87337 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 8B7113858402 for ; Tue, 19 Mar 2024 07:37:27 +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 0E2AC3858D35 for ; Tue, 19 Mar 2024 07:37:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0E2AC3858D35 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 0E2AC3858D35 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=1710833829; cv=none; b=OAeBWL/e2a3Glk1ufL+OPmxENnwIDK25cgkl8ueUso2CWYkC5dm1PPqAG9d8oBUKEB0SFRVvwdKCC3WmykA2AcSxYXK6eRH+VcnsdVpZOcg5SX3iQMV5MgQ8gwsb0oerlIwcL5fesf3fxa/69ukYm3B2/bf3bO6DhnN1zCspA4Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710833829; c=relaxed/simple; bh=ty6uC3dRxMRXun0oBus9Bf/cVp/UPhLRpy1bFn1dpB0=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=p0LsFFzlsnEkuyMIXiCW0eSlXA5XJSH8RYFU6hGQVh2cvuYDdi2NXa41YwD61xivT5nVw/eGWNindqJ6JikkXyd9c0+NZ2yI3OcNHDY+L253kHzPemI7UrJB8jtdOSV+yx/Lqoi1hJCz3w29hlMUCuBYZd9C0X/sns3r8FwQ1dQ= 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 2478137480 for ; Tue, 19 Mar 2024 07:37:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1710833826; 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=HLOG2IrMtULiXU2QE6PKkmC2jKig3Y3Bgxdu1Ja5clw=; b=JOoYAAJAeyhLz6qnf58sSlL492Uy2DToqSowPjV9qO3L47irOH835VsLlFFu3mH+b3aB7C z5CAD8oev4fBYAD5aFSbFkjmYLP8PkcnuPV9KKTiujej3Otxj6nPyCcqdfFaBI9q01ECAV a6SW28APoBd0WagiqI8e4FaF4iHokQY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1710833826; 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=HLOG2IrMtULiXU2QE6PKkmC2jKig3Y3Bgxdu1Ja5clw=; b=qGw4PJAi+nRNWf51CQF3PN7nWH3L2X2PD2gDSJI86ZmLrZVBSiwxldp6tt8UDY9PQFIp/O RLl/XxdCjt2wmjDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1710833826; 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=HLOG2IrMtULiXU2QE6PKkmC2jKig3Y3Bgxdu1Ja5clw=; b=JOoYAAJAeyhLz6qnf58sSlL492Uy2DToqSowPjV9qO3L47irOH835VsLlFFu3mH+b3aB7C z5CAD8oev4fBYAD5aFSbFkjmYLP8PkcnuPV9KKTiujej3Otxj6nPyCcqdfFaBI9q01ECAV a6SW28APoBd0WagiqI8e4FaF4iHokQY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1710833826; 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=HLOG2IrMtULiXU2QE6PKkmC2jKig3Y3Bgxdu1Ja5clw=; b=qGw4PJAi+nRNWf51CQF3PN7nWH3L2X2PD2gDSJI86ZmLrZVBSiwxldp6tt8UDY9PQFIp/O RLl/XxdCjt2wmjDA== 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 02462136A5 for ; Tue, 19 Mar 2024 07:37:05 +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 q8vNOqFA+WXdawAAD6G6ig (envelope-from ) for ; Tue, 19 Mar 2024 07:37:05 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH] [gdb/testsuite] Handle core without build-id in gdb.base/corefile-buildid.exp Date: Tue, 19 Mar 2024 08:38:12 +0100 Message-Id: <20240319073812.18995-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Spam-Score: 0.70 X-Spamd-Result: default: False [0.70 / 50.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_DN_NONE(0.00)[]; BROKEN_CONTENT_TYPE(1.50)[]; RCVD_COUNT_THREE(0.00)[3]; NEURAL_HAM_SHORT(-0.20)[-0.999]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; BAYES_HAM(-3.00)[100.00%]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCPT_COUNT_ONE(0.00)[1]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MID_CONTAINS_FROM(1.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_TLS_ALL(0.00)[] X-Spam-Level: Authentication-Results: smtp-out1.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, 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org On aarch64-linux (debian 12), when running test-case gdb.base/corefile-buildid.exp, I get: ... expecting exec file "debugdir-exec/.build-id/ec/f10ec5d39648774f8c35d3cf757c8db52f5163" info files^M Local core dump file:^M `build-exec/corefile-buildid.core', file type elf64-littleaarch64.^M 0x0000aaaac1d70000 - 0x0000aaaac1d71000 is load1^M ... 0x0000ffffffa8b000 - 0x0000ffffffaac000 is load16^M (gdb) FAIL: gdb.base/corefile-buildid.exp: exec: info files ... The problem is that the test-case expect the build-id to be available in the core file, while it isn't. Fix this by detecting that the build-id isn't available in the core file using eu-readelf, as in gdb.base/coredump-filter-build-id.exp. Tested on aarch64-linux. --- gdb/testsuite/gdb.base/corefile-buildid.exp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) base-commit: bb1684fbea382f81c71dee4f7a32ecb51a1deab4 diff --git a/gdb/testsuite/gdb.base/corefile-buildid.exp b/gdb/testsuite/gdb.base/corefile-buildid.exp index f9c85a8642d..130198611ec 100644 --- a/gdb/testsuite/gdb.base/corefile-buildid.exp +++ b/gdb/testsuite/gdb.base/corefile-buildid.exp @@ -217,7 +217,7 @@ proc locate_exec_from_core_build_id {corefile buildid suffix \ # of shared and/or stripped/.debug executables. proc do_corefile_buildid_tests {args} { - global binfile testfile srcfile execdir sharedir + global binfile testfile srcfile execdir sharedir hex # Parse options. parse_args [list {sepdebug} {shared}] @@ -266,6 +266,18 @@ proc do_corefile_buildid_tests {args} { } verbose -log "corefile is $corefile" + if { [catch "exec [gdb_find_eu-unstrip] -n --core $corefile" output] == 0 } { + set line [lindex [split $output "\n"] 0] + set binfile_re (?:[string_to_regexp $program_to_run]|\\\[(?:exe|pie)\\\]) + if { ![regexp "^${hex}\\+${hex} \[a-f0-9\]+@${hex}.*$binfile_re$" $line] } { + unsupported "build id for exec" + return + } + } else { + unsupported "eu-unstrip execution" + return + } + # Grab the build-id from the binary, removing ".debug" from the end. set buildid [build_id_debug_filename_get $program_to_run] if {$buildid == ""} {