Fix duplicate FAILs from ld testsuite

* testsuite/lib/ld-lib.exp (run_cc_link_tests): Don't fail tests
	twice.
This commit is contained in:
Alan Modra 2016-08-23 12:22:25 +09:30
parent eacfca90f1
commit d44ea5d05b
2 changed files with 9 additions and 10 deletions

View file

@ -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

View file

@ -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
}
}
}