From d44ea5d05b305bebedd2afaf344b361c5c2f9815 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Tue, 23 Aug 2016 12:22:25 +0930 Subject: Fix duplicate FAILs from ld testsuite * testsuite/lib/ld-lib.exp (run_cc_link_tests): Don't fail tests twice. --- ld/testsuite/lib/ld-lib.exp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'ld/testsuite') 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 } } } -- cgit v1.1