* ld-elfvers/vers.exp (test_ar): Sort the expected output so that

  it has matches the ordering of the obtained output.

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 2034795..8879a4a 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-28  Petr Muller  <pmuller@redhat.com>
+
+       * ld-elfvers/vers.exp (test_ar): Sort the expected output so that
+       it has matches the ordering of the obtained output.
+
 2008-01-28  H.J. Lu  <hongjiu.lu@intel.com>
 
        * ld-elf/eh1.d: Replace DW_CFA_def_cfa_reg with

diff --git a/ld/testsuite/ld-elfvers/vers.exp b/ld/testsuite/ld-elfvers/vers.exp
index f163c21..e2f658d 100644 (file)
--- a/ld/testsuite/ld-elfvers/vers.exp
+++ b/ld/testsuite/ld-elfvers/vers.exp
@@ -121,7 +121,7 @@ proc test_ar { test lib object expect } {
 
     catch "exec $nm --print-armap $tmpdir/$lib | grep \\\ in\\\  | egrep VERS\\\|bar\\\|foo | sort > $tmpdir/nm.out" exec_output
     if [string match "" $exec_output] then {
-       catch "exec $diff $tmpdir/nm.out $srcdir/$subdir/$expect" exec_output
+       catch "exec sort $srcdir/$subdir/$expect | $diff $tmpdir/nm.out -" exec_output
        set exec_output [prune_warnings $exec_output]
        if [string match "" $exec_output] then {
            pass $test