From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) by sourceware.org (Postfix) with ESMTPS id 9EF4A3858D39 for ; Wed, 19 Oct 2022 11:53:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9EF4A3858D39 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pf1-x42b.google.com with SMTP id y191so17014005pfb.2 for ; Wed, 19 Oct 2022 04:53:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=SksabJ+Tfi20GNMydzOaeAfybuQT3a+2XFkLKyOutJY=; b=kLLPVBdJQYcBO57P779cmGLCCBN79Ltnowh0wMM/JBgIeQ+pyrprZvqDDRqLe5h84r EUw5w/k/+k0lzJUb1Crbrx8M7OU30fHEROM+vk5saFU2l7Cp/l+lTROIq3z6CH8cyR1z QjrTNp3/BYw+d7WPcD8gGp5XKzoO8pP7kIT9UUMiyx83jGILF+iym6j0WCvS92JJogTb BdqfoLKCSVbsrTftdQvtOPKGQkW+KZcJq93ImWrKNc3CEMUsbsnZGIgpc0viA1yJk8Cc sCGx7fiyu2azvEKDbaWjqj785XyH4OEHnJiHbJRJbZhfld31f5UePZzt29294otFwbzg irUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=SksabJ+Tfi20GNMydzOaeAfybuQT3a+2XFkLKyOutJY=; b=wQoO/jWK3igO+kVLlh8ZEkJVYODKAxHHd+OlZPyvTNmdj+rF1wfVjzE+E6WhYNJW1i KtxjuK0UsTUyF4cW9f6HR5QVBp9HRQQCPEXStvPXbVRLSW8Co9We1U++YzKiYPdJ0y5p P55s7CKu5wNdxHqbyzwep+r7OMUvihdOVYzXVpLiKGtybJcaV9cFU0wLkTqphZ+jzyyF cOPXh10Vk2oiZENKk+ufTu4MM7W1v6xrpqkCRL1/jMHBXHQxoKvlUHcm1NEyINcFI1+5 Zlp8r0chIyRyUNrmsVpKYUgDpXcCvpdrAiWzNB1IeYDcFJYxBNbobcyJFiBxm9KOvNuG GqeQ== X-Gm-Message-State: ACrzQf0zaIfss/zYFjwWYtK7rUGk9US9ibRtucAwp6HnnEcFKJAYWyP4 /KraLIkuNFCIlibbZYE5oMhELEYwF6s= X-Google-Smtp-Source: AMsMyM7p5O2ZVoMR9C1YOUPIG3lvPJp6JOEJLSdr8QnKaDB58e9WCm5C9H1HfNLDSJTIXcNRHDFTFw== X-Received: by 2002:a05:6a00:124a:b0:563:55ba:a6f8 with SMTP id u10-20020a056a00124a00b0056355baa6f8mr8356358pfi.2.1666180402551; Wed, 19 Oct 2022 04:53:22 -0700 (PDT) Received: from squeak.grove.modra.org ([2406:3400:51d:8cc0:1cc1:f0c0:dfa1:b903]) by smtp.gmail.com with ESMTPSA id b26-20020aa7951a000000b005604c1a0fbcsm11196501pfp.74.2022.10.19.04.53.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Oct 2022 04:53:21 -0700 (PDT) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id 00D821140F51; Wed, 19 Oct 2022 22:23:18 +1030 (ACDT) Date: Wed, 19 Oct 2022 22:23:18 +1030 From: Alan Modra To: Tom de Vries Cc: rupesh potharla , Binutils Subject: Fix addr2line test for ppc64 elfv1 and mingw Message-ID: References: <20221019073533.3F8543858D3C@sourceware.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-3035.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,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 List-Id: On Wed, Oct 19, 2022 at 07:32:40PM +1030, Alan Modra wrote: > On Wed, Oct 19, 2022 at 09:55:59AM +0200, Tom de Vries via Binutils wrote: > > looks like this: > > ... > > regexp -line {^([0-9a-fA-F]+)?[ ]+T main} $output contents > > set list [regexp -inline -all -- {\S+} $contents] > > ... > > is causing: > > ... > > ERROR: tcl error sourcing /var/lib/buildbot/workers/wildebeest/binutils-debian-ppc64/binutils-gdb/binutils/testsuite/binutils-all/addr2line.exp. > > ERROR: tcl error code TCL LOOKUP VARNAME contents > > ERROR: can't read "contents": no such variable > > while executing > > "regexp -inline -all -- {\S+} $contents" > > (file "/var/lib/buildbot/workers/wildebeest/binutils-debian-ppc64/binutils-gdb/binutils/testsuite/binutils-all/addr2line.exp" > > line 31) > > invoked from within > > ... > > > > If the regexp doesn't match, contents is not set. > > Right. It doesn't match for PowerPC64 ELFv1 because function symbols > are defined on a descriptor and are flagged as "D" not "T". The test > also fails on cygwin/mingw where the compiler output is testprog.exe. > > I think the following will do the trick, I'll commit after a full > test run. It needed a bit more work to make the test pass on powerpc64 * testsuite/binutils-all/addr2line.exp: Tidy. For powerpc64 arrange to pass --synthetic to nm, and extract .main and .fn symbol address for addr2line test. Handle default executable extension on cygwin/mingw compilers. diff --git a/binutils/testsuite/binutils-all/addr2line.exp b/binutils/testsuite/binutils-all/addr2line.exp index 15e60366ac2..66a2d5d32a0 100644 --- a/binutils/testsuite/binutils-all/addr2line.exp +++ b/binutils/testsuite/binutils-all/addr2line.exp @@ -14,48 +14,60 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. -global $NM -global $ADDR2LINE - set testname "addr2line" +set opts "" +set dot "" +set exe [exeext] + +# powerpc64 function symbols are on descriptors rather than code. +if [istarget powerpc64-*-*] { + set opts --synthetic + set dot {\.} +} + if { [target_compile $srcdir/$subdir/testprog.c tmpdir/testprog executable debug] != "" } { verbose "Unable to compile test file." - untested "addr2line" + untested "$testname" return } #testcase for default option. #Run nm command and input the main symbol address to addr2line. -set output [binutils_run $NM "tmpdir/testprog"] -regexp -line {^([0-9a-fA-F]+)?[ ]+T main} $output contents -set list [regexp -inline -all -- {\S+} $contents] -set got [binutils_run $ADDR2LINE "-e tmpdir/testprog [lindex $list 0]"] -set want "$srcdir/$subdir/testprog.c:\[0-9\]+" -if ![regexp $want $got] then { - fail "$testname $got\n" +set output [binutils_run $NM "$opts tmpdir/testprog$exe"] +if ![regexp -line "^(\[0-9a-fA-F\]+)? +T ${dot}main" $output contents] then { + fail "$testname" } else { - pass "$testname" + set list [regexp -inline -all -- {\S+} $contents] + set got [binutils_run $ADDR2LINE "-e tmpdir/testprog$exe [lindex $list 0]"] + set want "$srcdir/$subdir/testprog.c:\[0-9\]+" + if ![regexp $want $got] then { + fail "$testname $got\n" + } else { + pass "$testname" + } } #testcase for -f option. #Run nm command and input the fn function symbol address to addr2line. -regexp -line {^([0-9a-fA-F]+)?[ ]+T fn} $output contents -pass "output is $output \n contents is $contents\n" -set list [regexp -inline -all -- {\S+} $contents] -set got [binutils_run $ADDR2LINE "-f -e tmpdir/testprog [lindex $list 0]"] -set want "fn\n$srcdir/$subdir/testprog.c:\[0-9\]+" -if ![regexp $want $got] then { - fail "$testname -f option $got\n" +if ![regexp -line "^(\[0-9a-fA-F\]+)? +T ${dot}fn" $output contents] then { + fail "$testname -f option" } else { - pass "$testname -f option" -} + set list [regexp -inline -all -- {\S+} $contents] + set got [binutils_run $ADDR2LINE "-f -e tmpdir/testprog$exe [lindex $list 0]"] + set want "fn\n$srcdir/$subdir/testprog.c:\[0-9\]+" + if ![regexp $want $got] then { + fail "$testname -f option $got\n" + } else { + pass "$testname -f option" + } #testcase for -s option. #Using the same fn function address used in -f option. -set got [binutils_run $ADDR2LINE "-s -e tmpdir/testprog [lindex $list 0]"] -set want "testprog.c:\[0-9\]+" -if ![regexp $want $got] then { - fail "$testname -s option $got\n" -} else { - pass "$testname -s option" + set got [binutils_run $ADDR2LINE "-s -e tmpdir/testprog$exe [lindex $list 0]"] + set want "testprog.c:\[0-9\]+" + if ![regexp $want $got] then { + fail "$testname -s option $got\n" + } else { + pass "$testname -s option" + } } -- Alan Modra Australia Development Lab, IBM