aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2016-08-23 12:22:25 +0930
committerAlan Modra <amodra@gmail.com>2016-08-23 12:23:05 +0930
commitd44ea5d05b305bebedd2afaf344b361c5c2f9815 (patch)
treeeeb8614ad1f9812d9122967e9dcb17cd56cab262
parenteacfca90f1ff457d3a7be9d593040218b6208d2b (diff)
downloadgdb-d44ea5d05b305bebedd2afaf344b361c5c2f9815.zip
gdb-d44ea5d05b305bebedd2afaf344b361c5c2f9815.tar.gz
gdb-d44ea5d05b305bebedd2afaf344b361c5c2f9815.tar.bz2
Fix duplicate FAILs from ld testsuite
* testsuite/lib/ld-lib.exp (run_cc_link_tests): Don't fail tests twice.
-rw-r--r--ld/ChangeLog5
-rw-r--r--ld/testsuite/lib/ld-lib.exp14
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
}
}
}