diff options
| author | Alan Modra <amodra@gmail.com> | 2016-08-23 12:22:25 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2016-08-23 12:23:05 +0930 |
| commit | d44ea5d05b305bebedd2afaf344b361c5c2f9815 (patch) | |
| tree | eeb8614ad1f9812d9122967e9dcb17cd56cab262 | |
| parent | eacfca90f1ff457d3a7be9d593040218b6208d2b (diff) | |
| download | binutils-gdb-d44ea5d05b305bebedd2afaf344b361c5c2f9815.tar.gz | |
Fix duplicate FAILs from ld testsuite
* testsuite/lib/ld-lib.exp (run_cc_link_tests): Don't fail tests
twice.
| -rw-r--r-- | ld/ChangeLog | 5 | ||||
| -rw-r--r-- | ld/testsuite/lib/ld-lib.exp | 14 |
2 files changed, 9 insertions, 10 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 34cdf776ad5..02375edc18d 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 7b190bee2a6..616ac51c885 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 } } } |