From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 2 Jan 2004 01:07:21 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/ChangeLog~79
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=973fcec8cda803e9628fa544e1aad32655ad5f63;p=thirdparty%2Fglibc.git

Update.

	* 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.

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

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 27632ca6d3a..3ccf1000dcf 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,11 @@
+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.
+
 2004-01-01  Petter Reinholdtsen  <pere@hungry.com>
 
 	* tst-fmon.data: Add simple test to check left justified currency
diff --git a/localedata/sort-test.sh b/localedata/sort-test.sh
index a1ec24060a9..67de72eef31 100644
--- a/localedata/sort-test.sh
+++ b/localedata/sort-test.sh
@@ -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