diff options
28 files changed, 108 insertions, 88 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 0c08e68..5b36623 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,34 @@ +2006-06-06 Alan Modra <amodra@bigpond.net.au> + + * 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. + 2006-06-05 Alan Modra <amodra@bigpond.net.au> * ld-elf/sec64k.exp: Add "main" symbol. Use dc.a for addresses. 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 diff --git a/ld/testsuite/ld-elfvers/vers1.ver b/ld/testsuite/ld-elfvers/vers1.ver index ace685d..a42b970 100644 --- a/ld/testsuite/ld-elfvers/vers1.ver +++ b/ld/testsuite/ld-elfvers/vers1.ver @@ -1,8 +1,8 @@ Version definitions: -1 0x01 0x0c96425f vers1.so -2 0x00 0x0a7927b1 VERS_1.1 -3 0x00 0x0a7927b2 VERS_1.2 +[1-4] 0x01 0x0c96425f vers1.so +[1-4] 0x00 0x0a7927b1 VERS_1.1 +[1-4] 0x00 0x0a7927b2 VERS_1.2 VERS_1.1 -4 0x00 0x0a7922b0 VERS_2.0 +[1-4] 0x00 0x0a7922b0 VERS_2.0 VERS_1.2 diff --git a/ld/testsuite/ld-elfvers/vers15.ver b/ld/testsuite/ld-elfvers/vers15.ver index f60021e..3f960fd 100644 --- a/ld/testsuite/ld-elfvers/vers15.ver +++ b/ld/testsuite/ld-elfvers/vers15.ver @@ -1,5 +1,5 @@ Version definitions: -1 0x01 0x07cc9645 vers15 -2 0x00 0x0a7927b2 VERS_1.2 -3 0x00 0x0a7927b1 VERS_1.1 +[1-3] 0x01 0x07cc9645 vers15 +[1-3] 0x00 0x0a7927b1 VERS_1.1 +[1-3] 0x00 0x0a7927b2 VERS_1.2 diff --git a/ld/testsuite/ld-elfvers/vers16a.ver b/ld/testsuite/ld-elfvers/vers16a.ver index 5b6063b..7b50067 100644 --- a/ld/testsuite/ld-elfvers/vers16a.ver +++ b/ld/testsuite/ld-elfvers/vers16a.ver @@ -1,3 +1,3 @@ Version definitions: -1 0x01 0x064c090f vers16a.so -2 0x00 0x0a7927b1 VERS_1.1 +[1-2] 0x01 0x064c090f vers16a.so +[1-2] 0x00 0x0a7927b1 VERS_1.1 diff --git a/ld/testsuite/ld-elfvers/vers17.ver b/ld/testsuite/ld-elfvers/vers17.ver index 0dad2a6..b234c9b 100644 --- a/ld/testsuite/ld-elfvers/vers17.ver +++ b/ld/testsuite/ld-elfvers/vers17.ver @@ -1,3 +1,3 @@ Version definitions: -1 0x01 0x0964f95f vers17.so -2 0x00 0x0a7922b0 VERS_2.0 +[1-2] 0x01 0x0964f95f vers17.so +[1-2] 0x00 0x0a7922b0 VERS_2.0 diff --git a/ld/testsuite/ld-elfvers/vers18.ver b/ld/testsuite/ld-elfvers/vers18.ver index c6b14e8..c6023de 100644 --- a/ld/testsuite/ld-elfvers/vers18.ver +++ b/ld/testsuite/ld-elfvers/vers18.ver @@ -1,7 +1,7 @@ Version definitions: -1 0x01 0x0964e95f vers18.so -2 0x00 0x0a7927b1 VERS_1.1 -3 0x00 0x0a7927b2 VERS_1.2 +[1-4] 0x01 0x0964e95f vers18.so +[1-4] 0x00 0x0a7927b1 VERS_1.1 +[1-4] 0x00 0x0a7927b2 VERS_1.2 VERS_1.1 -4 0x00 0x0a7922b0 VERS_2.0 +[1-4] 0x00 0x0a7922b0 VERS_2.0 VERS_1.2 diff --git a/ld/testsuite/ld-elfvers/vers2.ver b/ld/testsuite/ld-elfvers/vers2.ver index 4ca81eb..ea992ff 100644 --- a/ld/testsuite/ld-elfvers/vers2.ver +++ b/ld/testsuite/ld-elfvers/vers2.ver @@ -1,6 +1,6 @@ Version definitions: -1 0x01 0x0c96525f vers2.so -2 0x00 0x08785b51 VERS_XXX_1.1 +[1-2] 0x01 0x0c96525f vers2.so +[1-2] 0x00 0x08785b51 VERS_XXX_1.1 Version References: required from tmpdir/vers1.so: diff --git a/ld/testsuite/ld-elfvers/vers20.ver b/ld/testsuite/ld-elfvers/vers20.ver index afeb137..1339147 100644 --- a/ld/testsuite/ld-elfvers/vers20.ver +++ b/ld/testsuite/ld-elfvers/vers20.ver @@ -1,4 +1,4 @@ Version definitions: -1 0x01 0x0965695f vers20.so -2 0x00 0x0a7927b1 VERS_1.1 +[1-2] 0x01 0x0965695f vers20.so +[1-2] 0x00 0x0a7927b1 VERS_1.1 diff --git a/ld/testsuite/ld-elfvers/vers20a.ver b/ld/testsuite/ld-elfvers/vers20a.ver index 2592f02..c7e11fb 100644 --- a/ld/testsuite/ld-elfvers/vers20a.ver +++ b/ld/testsuite/ld-elfvers/vers20a.ver @@ -1,4 +1,4 @@ Version definitions: -1 0x01 0x0652090f vers20a.so -2 0x00 0x0a7927b1 VERS_1.1 +[1-2] 0x01 0x0652090f vers20a.so +[1-2] 0x00 0x0a7927b1 VERS_1.1 diff --git a/ld/testsuite/ld-elfvers/vers21.ver b/ld/testsuite/ld-elfvers/vers21.ver index 3ba24d8..76e4a52 100644 --- a/ld/testsuite/ld-elfvers/vers21.ver +++ b/ld/testsuite/ld-elfvers/vers21.ver @@ -1,4 +1,4 @@ Version definitions: -1 0x01 0x0965595f vers21.so -2 0x00 0x05aa7610 VERS.0 +[1-2] 0x01 0x0965595f vers21.so +[1-2] 0x00 0x05aa7610 VERS.0 diff --git a/ld/testsuite/ld-elfvers/vers22a.ver b/ld/testsuite/ld-elfvers/vers22a.ver index bb4d3bf..b7e1f62 100644 --- a/ld/testsuite/ld-elfvers/vers22a.ver +++ b/ld/testsuite/ld-elfvers/vers22a.ver @@ -1,4 +1,4 @@ Version definitions: -1 0x01 0x0660090f vers22a.so -2 0x00 0x05aa7610 VERS.0 +[1-2] 0x01 0x0660090f vers22a.so +[1-2] 0x00 0x05aa7610 VERS.0 diff --git a/ld/testsuite/ld-elfvers/vers22b.ver b/ld/testsuite/ld-elfvers/vers22b.ver index b1c834b..b20f636 100644 --- a/ld/testsuite/ld-elfvers/vers22b.ver +++ b/ld/testsuite/ld-elfvers/vers22b.ver @@ -1,4 +1,4 @@ Version definitions: -1 0x01 0x065f990f vers22b.so -2 0x00 0x05aa7610 VERS.0 +[1-2] 0x01 0x065f990f vers22b.so +[1-2] 0x00 0x05aa7610 VERS.0 diff --git a/ld/testsuite/ld-elfvers/vers23a.ver b/ld/testsuite/ld-elfvers/vers23a.ver index 9132d2d..3f3e3c0 100644 --- a/ld/testsuite/ld-elfvers/vers23a.ver +++ b/ld/testsuite/ld-elfvers/vers23a.ver @@ -1,4 +1,4 @@ Version definitions: -1 0x01 0x065f090f vers23a.so -2 0x00 0x05aa7610 VERS.0 +[1-2] 0x01 0x065f090f vers23a.so +[1-2] 0x00 0x05aa7610 VERS.0 diff --git a/ld/testsuite/ld-elfvers/vers23b.ver b/ld/testsuite/ld-elfvers/vers23b.ver index 629d2bc..4e3edb3 100644 --- a/ld/testsuite/ld-elfvers/vers23b.ver +++ b/ld/testsuite/ld-elfvers/vers23b.ver @@ -1,4 +1,4 @@ Version definitions: -1 0x01 0x065e990f vers23b.so -2 0x00 0x05aa7610 VERS.0 +[1-2] 0x01 0x065e990f vers23b.so +[1-2] 0x00 0x05aa7610 VERS.0 diff --git a/ld/testsuite/ld-elfvers/vers23c.ver b/ld/testsuite/ld-elfvers/vers23c.ver index 73d7716..1fc69e8 100644 --- a/ld/testsuite/ld-elfvers/vers23c.ver +++ b/ld/testsuite/ld-elfvers/vers23c.ver @@ -1,4 +1,4 @@ Version definitions: -1 0x01 0x065ea90f vers23c.so -2 0x00 0x05aa7610 VERS.0 +[1-2] 0x01 0x065ea90f vers23c.so +[1-2] 0x00 0x05aa7610 VERS.0 diff --git a/ld/testsuite/ld-elfvers/vers25a.ver b/ld/testsuite/ld-elfvers/vers25a.ver index 81a7160..df3aad0 100644 --- a/ld/testsuite/ld-elfvers/vers25a.ver +++ b/ld/testsuite/ld-elfvers/vers25a.ver @@ -1,4 +1,4 @@ Version definitions: -1 0x01 0x065d090f vers25a.so -2 0x00 0x05aa7610 VERS.0 +[1-2] 0x01 0x065d090f vers25a.so +[1-2] 0x00 0x05aa7610 VERS.0 diff --git a/ld/testsuite/ld-elfvers/vers26a.ver b/ld/testsuite/ld-elfvers/vers26a.ver index 3e67ef1..5462658 100644 --- a/ld/testsuite/ld-elfvers/vers26a.ver +++ b/ld/testsuite/ld-elfvers/vers26a.ver @@ -1,4 +1,4 @@ Version definitions: -1 0x01 0x065c090f vers26a.so -2 0x00 0x05aa7610 VERS.0 +[1-2] 0x01 0x065c090f vers26a.so +[1-2] 0x00 0x05aa7610 VERS.0 diff --git a/ld/testsuite/ld-elfvers/vers27a.ver b/ld/testsuite/ld-elfvers/vers27a.ver index 06d85e6..634f1f0 100644 --- a/ld/testsuite/ld-elfvers/vers27a.ver +++ b/ld/testsuite/ld-elfvers/vers27a.ver @@ -1,4 +1,4 @@ Version definitions: -1 0x01 0x065b090f vers27a.so -2 0x00 0x05aa7610 VERS.0 +[1-2] 0x01 0x065b090f vers27a.so +[1-2] 0x00 0x05aa7610 VERS.0 diff --git a/ld/testsuite/ld-elfvers/vers27d.ver b/ld/testsuite/ld-elfvers/vers27d.ver index 672c7ad..8343f3a 100644 --- a/ld/testsuite/ld-elfvers/vers27d.ver +++ b/ld/testsuite/ld-elfvers/vers27d.ver @@ -1,4 +1,4 @@ Version definitions: -1 0x01 0x05ac0cff vers27d1.so -2 0x00 0x05aa7610 VERS.0 +[1-2] 0x01 0x05ac0cff vers27d1.so +[1-2] 0x00 0x05aa7610 VERS.0 diff --git a/ld/testsuite/ld-elfvers/vers28b.ver b/ld/testsuite/ld-elfvers/vers28b.ver index ab99615..b826c53 100644 --- a/ld/testsuite/ld-elfvers/vers28b.ver +++ b/ld/testsuite/ld-elfvers/vers28b.ver @@ -1,4 +1,4 @@ Version definitions: -1 0x01 0x0659990f vers28b.so -2 0x00 0x05aa7610 VERS.0 +[1-2] 0x01 0x0659990f vers28b.so +[1-2] 0x00 0x05aa7610 VERS.0 diff --git a/ld/testsuite/ld-elfvers/vers29.ver b/ld/testsuite/ld-elfvers/vers29.ver index 85c05a8..5e73fab 100644 --- a/ld/testsuite/ld-elfvers/vers29.ver +++ b/ld/testsuite/ld-elfvers/vers29.ver @@ -1,3 +1,3 @@ Version definitions: -1 0x01 0x0965d95f vers29.so -2 0x00 0x0965d95f vers29.so +[1-2] 0x01 0x0965d95f vers29.so +[1-2] 0x00 0x0965d95f vers29.so diff --git a/ld/testsuite/ld-elfvers/vers30.ver b/ld/testsuite/ld-elfvers/vers30.ver index dfcf0da..e0968b9 100644 --- a/ld/testsuite/ld-elfvers/vers30.ver +++ b/ld/testsuite/ld-elfvers/vers30.ver @@ -1,4 +1,4 @@ Version definitions: -1 0x01 0x0966695f vers30.so -2 0x00 0x079239b0 VERS_30.0 +[1-2] 0x01 0x0966695f vers30.so +[1-2] 0x00 0x079239b0 VERS_30.0 diff --git a/ld/testsuite/ld-elfvers/vers31.ver b/ld/testsuite/ld-elfvers/vers31.ver index b79a5ab..c1a0ed4 100644 --- a/ld/testsuite/ld-elfvers/vers31.ver +++ b/ld/testsuite/ld-elfvers/vers31.ver @@ -1,3 +1,3 @@ Version definitions: -1 0x01 0x0966595f vers31.so -2 0x00 0x07923ab0 VERS_31.0 +[1-2] 0x01 0x0966595f vers31.so +[1-2] 0x00 0x07923ab0 VERS_31.0 diff --git a/ld/testsuite/ld-elfvers/vers4a.ver b/ld/testsuite/ld-elfvers/vers4a.ver index 41ee241..1f02b9d 100644 --- a/ld/testsuite/ld-elfvers/vers4a.ver +++ b/ld/testsuite/ld-elfvers/vers4a.ver @@ -1,4 +1,4 @@ Version definitions: -1 0x01 0x07cc96a1 vers4a -2 0x00 0x0a7922b0 VERS_2.0 +[1-2] 0x01 0x07cc96a1 vers4a +[1-2] 0x00 0x0a7922b0 VERS_2.0 diff --git a/ld/testsuite/ld-elfvers/vers7a.ver b/ld/testsuite/ld-elfvers/vers7a.ver index 7b3bf0a..eeac5c5 100644 --- a/ld/testsuite/ld-elfvers/vers7a.ver +++ b/ld/testsuite/ld-elfvers/vers7a.ver @@ -1,4 +1,4 @@ Version definitions: -1 0x01 0x096d595f vers7a.so -2 0x00 0x05aa7921 VERS_1 +[1-2] 0x01 0x096d595f vers7a.so +[1-2] 0x00 0x05aa7921 VERS_1 diff --git a/ld/testsuite/ld-elfvers/vers8.ver b/ld/testsuite/ld-elfvers/vers8.ver index a4b5296..47996c9 100644 --- a/ld/testsuite/ld-elfvers/vers8.ver +++ b/ld/testsuite/ld-elfvers/vers8.ver @@ -1,8 +1,8 @@ Version definitions: -1 0x01 0x0c96b25f vers8.so -2 0x00 0x0a7927b1 VERS_1.1 -3 0x00 0x0a7927b2 VERS_1.2 +[1-4] 0x01 0x0c96b25f vers8.so +[1-4] 0x00 0x0a7927b1 VERS_1.1 +[1-4] 0x00 0x0a7927b2 VERS_1.2 VERS_1.1 -4 0x00 0x0a7922b0 VERS_2.0 +[1-4] 0x00 0x0a7922b0 VERS_2.0 VERS_1.2 diff --git a/ld/testsuite/ld-elfvers/vers9.ver b/ld/testsuite/ld-elfvers/vers9.ver index cc73691..fce267c 100644 --- a/ld/testsuite/ld-elfvers/vers9.ver +++ b/ld/testsuite/ld-elfvers/vers9.ver @@ -1,5 +1,5 @@ Version definitions: -1 0x01 0x007cc969 vers9 -2 0x00 0x0a7927b1 VERS_1.1 -3 0x00 0x0a7927b2 VERS_1.2 +[1-3] 0x01 0x007cc969 vers9 +[1-3] 0x00 0x0a7927b1 VERS_1.1 +[1-3] 0x00 0x0a7927b2 VERS_1.2 |