[PATCH] Report which of the sorting methods that fail

Petter Reinholdtsen pere@hungry.com
Thu Jan 1 13:23:00 GMT 2004


Here is a small improvement to the sorting test.  I made it after
trying to fix an error in the test code by updating the wrong test. :)

2004-01-01  Petter Reinholdtsen  <pere@hungry.com>

	* sort-test.sh: Print the status for both the sorting tests, xfrm
	and collate, making it possible to know which one of them that
	fail if only one of them misbehaves.  Indent output from
	'diff -u' when sorting test fail, to make it easier to visually
	group the output.

Index: localedata/sort-test.sh
===================================================================
RCS file: /cvs/glibc/libc/localedata/sort-test.sh,v
retrieving revision 1.11
diff -u -3 -p -u -r1.11 sort-test.sh
--- localedata/sort-test.sh	1 May 2003 07:16:00 -0000	1.11
+++ localedata/sort-test.sh	1 Jan 2004 13:17:30 -0000
@@ -17,6 +17,13 @@ for l in $lang; do
    ${common_objpfx}localedata/collate-test $id < $cns.in \
    > ${common_objpfx}localedata/$cns.out || here=1
   cmp -s $cns.in ${common_objpfx}localedata/$cns.out || here=1
+  if test $here -eq 0; then
+    echo "$l collate-test OK"
+  else
+    echo "$l collate-test FAIL"
+    diff -u $cns.in ${common_objpfx}localedata/$cns.out | sed 's/^/  /'
+    status=1
+  fi
 
   LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}/iconvdata \
    LC_ALL=$l ${run_program_prefix} \
@@ -24,10 +31,10 @@ for l in $lang; do
    > ${common_objpfx}localedata/$cns.xout || here=1
   cmp -s $cns.in ${common_objpfx}localedata/$cns.xout || here=1
   if test $here -eq 0; then
-    echo "$l OK"
+    echo "$l xfrm-test OK"
   else
-    echo "$l FAIL"
-    diff -u $cns.in ${common_objpfx}localedata/$cns.xout
+    echo "$l xfrm-test FAIL"
+    diff -u $cns.in ${common_objpfx}localedata/$cns.xout | sed 's/^/  /'
     status=1
   fi
 done



More information about the Libc-alpha mailing list