This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb] Fix duplicate FAILs from ld testsuite
- From: Alan Modra <amodra at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 23 Aug 2016 04:28:58 -0000
- Subject: [binutils-gdb] Fix duplicate FAILs from ld testsuite
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=d44ea5d05b305bebedd2afaf344b361c5c2f9815
commit d44ea5d05b305bebedd2afaf344b361c5c2f9815
Author: Alan Modra <amodra@gmail.com>
Date: Tue Aug 23 12:22:25 2016 +0930
Fix duplicate FAILs from ld testsuite
* testsuite/lib/ld-lib.exp (run_cc_link_tests): Don't fail tests
twice.
Diff:
---
ld/ChangeLog | 5 +++++
ld/testsuite/lib/ld-lib.exp | 14 ++++----------
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 34cdf77..02375ed 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2016-08-23 Alan Modra <amodra@gmail.com>
+
+ * testsuite/lib/ld-lib.exp (run_cc_link_tests): Don't fail tests
+ twice.
+
2016-08-19 Nick Clifton <nickc@redhat.com>
* emultempl/aarch64elf.em (before_parse): Initialise the relro
diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp
index 7b190be..616ac51 100644
--- a/ld/testsuite/lib/ld-lib.exp
+++ b/ld/testsuite/lib/ld-lib.exp
@@ -1588,7 +1588,6 @@ proc run_cc_link_tests { ldtests } {
# compile only
} elseif { [regexp ".*\\.a$" $binfile] } {
if { ![ar_simple_create $ar $ldflags $binfile "$objfiles"] } {
- fail $testname
set failed 1
}
} else {
@@ -1605,10 +1604,6 @@ proc run_cc_link_tests { ldtests } {
set failed 1
}
}
-
- if { $failed == 1 } {
- fail $testname
- }
}
if { $failed == 0 } {
@@ -1669,13 +1664,12 @@ proc run_cc_link_tests { ldtests } {
}
}
- if { $failed != 0 } {
+ if { $failed } {
fail $testname
- } elseif { $is_unresolved == 0 } {
- pass $testname
- } else {
+ } elseif { $is_unresolved } {
unresolved $testname
- continue
+ } else {
+ pass $testname
}
}
}