This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
PR23235, make check uses system installed ld
- From: Alan Modra <amodra at gmail dot com>
- To: binutils at sourceware dot org
- Date: Mon, 28 May 2018 21:45:52 +0930
- Subject: PR23235, make check uses system installed ld
This patch doesn't stop the build-id and debuglink tests using the
installed ld, it just prevents a compiler failure from resulting in a
test fail. We could move the tests to the ld testsuite but it doesn't
seem all that important.
PR 23235
* testsuite/binutils-all/compress.exp (test_gnu_debuglink): Return
unsupported rather than fail on compile errors.
* testsuite/binutils-all/objdump.exp (test_build_id_debuglink):
Likewise. Save and restore CFLAGS_FOR_TARGET.
diff --git a/binutils/testsuite/binutils-all/compress.exp b/binutils/testsuite/binutils-all/compress.exp
index 12a43b025c..edbe9dd5ca 100644
--- a/binutils/testsuite/binutils-all/compress.exp
+++ b/binutils/testsuite/binutils-all/compress.exp
@@ -692,7 +692,7 @@ proc test_gnu_debuglink {} {
}
if { [target_compile $srcdir/$subdir/testprog.c tmpdir/testprog exectuable debug] != "" } {
- fail "$test (build)"
+ unsupported "$test (build)"
return
}
set got [remote_exec host "$OBJDUMP -S tmpdir/testprog" "" "/dev/null" "tmpdir/testprog.dump"]
diff --git a/binutils/testsuite/binutils-all/objdump.exp b/binutils/testsuite/binutils-all/objdump.exp
index b9232e9229..d9d07138aa 100644
--- a/binutils/testsuite/binutils-all/objdump.exp
+++ b/binutils/testsuite/binutils-all/objdump.exp
@@ -363,14 +363,21 @@ proc test_build_id_debuglink {} {
}
# Use a fixed build-id.
+ if { [info exists CFLAGS_FOR_TARGET] } {
+ set save_CFLAGS_FOR_TARGET $CFLAGS_FOR_TARGET
+ }
set CFLAGS_FOR_TARGET "-g -Wl,--build-id=0x12345678abcdef01"
if { [target_compile $srcdir/$subdir/testprog.c tmpdir/testprog exectuable debug] != "" } {
- fail "$test (build)"
+ unsupported "$test (build)"
return
}
- # FIXME: Do we need to restore CFLAGS_FOR_TARGET to its old value ?
+ if { [info exists save_CFLAGS_FOR_TARGET] } {
+ set CFLAGS_FOR_TARGET $save_CFLAGS_FOR_TARGET
+ } else {
+ unset CFLAGS_FOR_TARGET
+ }
if { [binutils_run $STRIP "--strip-debug --remove-section=.comment tmpdir/testprog -o tmpdir/testprog.strip"] != "" } {
fail "$test (strip debug info)"
--
Alan Modra
Australia Development Lab, IBM