From ca16c5b392b1c78019fea1710c4f4433161626c5 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Sat, 3 Dec 2016 20:59:19 +1030 Subject: [PATCH] ld-elfvers don't fail on non-empty results * testsuite/ld-elfvers/vers.exp (objdump_dynsymstuff): Don't abort on non-empty results with empty expected. --- ld/ChangeLog | 5 +++++ ld/testsuite/ld-elfvers/vers.exp | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index c02f5e8e3a9..86a4fce21b0 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2016-12-03 Alan Modra + + * testsuite/ld-elfvers/vers.exp (objdump_dynsymstuff): Don't abort + on non-empty results with empty expected. + 2016-12-03 Alan Modra * testsuite/ld-cdtest/cdtest-foo.cc: Test for __GNUG__ >= 2. diff --git a/ld/testsuite/ld-elfvers/vers.exp b/ld/testsuite/ld-elfvers/vers.exp index 2f86938f5cd..a2a678b924e 100644 --- a/ld/testsuite/ld-elfvers/vers.exp +++ b/ld/testsuite/ld-elfvers/vers.exp @@ -390,8 +390,12 @@ proc objdump_dynsymstuff { objdump object expectfile } { close $file_b # Support empty files. - if { ![info exists list_a] && ![info exists list_b] } then { - return 1 + if { ![info exists list_a] } then { + if { ![info exists list_b] } then { + return 1 + } + verbose -log "\t$tmpdir/objdump.out: $list_b" + return 0 } for { set i 0 } { $i < [llength $list_b] } { incr i } { -- 2.30.2