Fix addr2line test for ppc64 elfv1 and mingw
Checks
Commit Message
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.
@@ -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"
+ }
}