From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2205) id 398923858D28; Wed, 20 Mar 2024 18:29:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 398923858D28 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1710959380; bh=8Kiqrsa/mI2o2aRmYRnUoL3nnEGuh4hIarUmoeFA+aw=; h=From:To:Subject:Date:From; b=wumWInfKlz+x4amodwR4qkQYcGeD2LjobdcUUpTTZeTUPkslbqU/YIbAq0+ww808N KeHztypXl/dexQB1y2RIj2Xvjgz1P9lpp4kpfCf0fH4QLpQUyRW/bp6vH19TBBtmfK YHE41H3o46HntbSDy+ydOH0l2iAQkg0VZW1a6gmM= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom de Vries To: gdb-cvs@sourceware.org Subject: [binutils-gdb] [gdb/testsuite] Handle core without build-id in gdb.base/corefile-buildid.exp X-Act-Checkin: binutils-gdb X-Git-Author: Tom de Vries X-Git-Refname: refs/heads/master X-Git-Oldrev: d51a931152993fb095fd52083f2ba17d19e32ffd X-Git-Newrev: 8d0e6e08317fc622842bfb30480036a991f12e20 Message-Id: <20240320182940.398923858D28@sourceware.org> Date: Wed, 20 Mar 2024 18:29:40 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D8d0e6e08317f= c622842bfb30480036a991f12e20 commit 8d0e6e08317fc622842bfb30480036a991f12e20 Author: Tom de Vries Date: Wed Mar 20 19:29:18 2024 +0100 [gdb/testsuite] Handle core without build-id in gdb.base/corefile-build= id.exp =20 On aarch64-linux (debian 12), when running test-case gdb.base/corefile-= buildid.exp, I get: ... expecting exec file "debugdir-exec/.build-id/ec/f10ec5d39648774f8c35d3c= f757c8db52f5163" info files^M Local core dump file:^M `build-exec/corefile-buildid.core', file type elf64-littleaarch= 64.^M 0x0000aaaac1d70000 - 0x0000aaaac1d71000 is load1^M ... 0x0000ffffffa8b000 - 0x0000ffffffaac000 is load16^M (gdb) FAIL: gdb.base/corefile-buildid.exp: exec: info files ... =20 The problem is that the test-case expect the build-id to be available i= n the core file, while it isn't. =20 Fix this by detecting that the build-id isn't available in the core fil= e using eu-readelf, as in gdb.base/coredump-filter-build-id.exp. =20 Tested on aarch64-linux. =20 Approved-By: Tom Tromey Diff: --- gdb/testsuite/gdb.base/corefile-buildid.exp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/gdb.base/corefile-buildid.exp b/gdb/testsuite/gd= b.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 s= uffix \ # of shared and/or stripped/.debug executables. =20 proc do_corefile_buildid_tests {args} { - global binfile testfile srcfile execdir sharedir + global binfile testfile srcfile execdir sharedir hex =20 # Parse options. parse_args [list {sepdebug} {shared}] @@ -266,6 +266,18 @@ proc do_corefile_buildid_tests {args} { } verbose -log "corefile is $corefile" =20 + if { [catch "exec [gdb_find_eu-unstrip] -n --core $corefile" output] =3D= =3D 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$" $li= ne] } { + 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 =3D=3D ""} {