Fix duplicate FAILs from ld testsuite

Alan Modra amodra@gmail.com
Tue Aug 23 04:29:00 GMT 2016


Applied.

	* testsuite/lib/ld-lib.exp (run_cc_link_tests): Don't fail tests
	twice.

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

-- 
Alan Modra
Australia Development Lab, IBM



More information about the Binutils mailing list