diff options
| author | Alan Modra <amodra@gmail.com> | 2006-06-06 04:30:21 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2006-06-06 04:30:21 +0000 |
| commit | 65864bd2a680ce25c61802a416514fd526ad82a4 (patch) | |
| tree | 33646dea12756b3724183e581bed4065c6847831 /ld/testsuite/ld-elfvers/vers.exp | |
| parent | 0bef4ce53867deab8b2876677d6c201b87a85a27 (diff) | |
| download | gdb-65864bd2a680ce25c61802a416514fd526ad82a4.zip gdb-65864bd2a680ce25c61802a416514fd526ad82a4.tar.gz gdb-65864bd2a680ce25c61802a416514fd526ad82a4.tar.bz2 | |
* ld-elfvers/vers.exp (objdump_versionstuff): Allow versions in
any order.
* ld-elfvers/vers1.ver: Update.
* ld-elfvers/vers2.ver: Update.
* ld-elfvers/vers4a.ver: Update.
* ld-elfvers/vers7a.ver: Update.
* ld-elfvers/vers8.ver: Update.
* ld-elfvers/vers9.ver: Update.
* ld-elfvers/vers15.ver: Update.
* ld-elfvers/vers16a.ver: Update.
* ld-elfvers/vers17.ver: Update.
* ld-elfvers/vers18.ver: Update.
* ld-elfvers/vers20.ver: Update.
* ld-elfvers/vers20a.ver: Update.
* ld-elfvers/vers21.ver: Update.
* ld-elfvers/vers22a.ver: Update.
* ld-elfvers/vers22b.ver: Update.
* ld-elfvers/vers23a.ver: Update.
* ld-elfvers/vers23b.ver: Update.
* ld-elfvers/vers23c.ver: Update.
* ld-elfvers/vers25a.ver: Update.
* ld-elfvers/vers26a.ver: Update.
* ld-elfvers/vers27a.ver: Update.
* ld-elfvers/vers27d.ver: Update.
* ld-elfvers/vers28b.ver: Update.
* ld-elfvers/vers29.ver: Update.
* ld-elfvers/vers30.ver: Update.
* ld-elfvers/vers31.ver: Update.
Diffstat (limited to 'ld/testsuite/ld-elfvers/vers.exp')
| -rw-r--r-- | ld/testsuite/ld-elfvers/vers.exp | 45 |
1 files changed, 17 insertions, 28 deletions
diff --git a/ld/testsuite/ld-elfvers/vers.exp b/ld/testsuite/ld-elfvers/vers.exp index 6bb77a7..d8ba1b8 100644 --- a/ld/testsuite/ld-elfvers/vers.exp +++ b/ld/testsuite/ld-elfvers/vers.exp @@ -460,44 +460,33 @@ proc objdump_versionstuff { objdump object expectfile } { # It's OK if there are extra lines in the actual output; they # may come from version information in libc. We require that - # every line in EXPECTFILE appear in the output in order. + # every line in EXPECTFILE appear in the output in any order. - set f1 [open $tmpdir/objdump.out r] set f2 [open $expectfile r] while { [gets $f2 l2] != -1 } { if { ![regexp "^#.*$" $l2] } then { - break - } - } - while { [gets $f1 l1] != -1 } { - if { [string match $l2 $l1] } then { - if { [gets $f2 l2] == -1 } then { + set f1 [open $tmpdir/objdump.out r] + while { [gets $f1 l1] != -1 } { + if { [string match $l2 $l1] } then { + break + } + } + close $f1 + + if { ![string match $l2 $l1] } then { + verbose -log "Did not find \"$l2\"" + set f1 [open $tmpdir/objdump.out r] + while { [gets $f1 l1] != -1 } { + verbose -log $l1 + } close $f1 close $f2 - return 1 + return 0 } } } - - # We reached the end of the output without seeing the line we - # expected. This is a test failure. - - close $f1 close $f2 - - # Support empty expected file. - if [string match "" $l2] then { - return 1 - } - - verbose -log "Did not find \"$l2\"" - set f1 [open $tmpdir/objdump.out r] - while { [gets $f1 l1] != -1 } { - verbose -log $l1 - } - - verbose -log "$exec_output" - return 0 + return 1 } else { verbose -log "$exec_output" return 0 |