From: Nick Clifton <nickc@redhat.com>
Date: Mon, 28 Jan 2008 16:41:05 +0000 (+0000)
Subject: * ld-elfvers/vers.exp (test_ar): Sort the expected output so that
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a0a21afef580d360d994a31c353ceb3ad664ed89;p=binutils-gdb.git

* 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 20347950fca..8879a4aa27e 100644
--- 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 f163c218370..e2f658dac75 100644
--- 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