This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

PATCH, ld testsuite: fix false fail - sorted output and golden output


Hi,

ld-elfvers/vers.exp produces a false FAIL when one output is sorted with
different sorting rules than the golden output
(testsuite/ld-elfvers/vers13.asym) was sorted with. I've changed
vers.exp to pre-sort the golden output with the installed sort, so the
same rules will be applied.

Petr



Index: ld/testsuite/ld-elfvers/vers.exp
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers.exp,v
retrieving revision 1.43
diff -u -r1.43 vers.exp
--- ld/testsuite/ld-elfvers/vers.exp	10 Jul 2007 14:51:55 -0000	1.43
+++ ld/testsuite/ld-elfvers/vers.exp	14 Jan 2008 14:46:45 -0000
@@ -121,7 +121,7 @@
 
     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

Attachment: signature.asc
Description: This is a digitally signed message part


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]