Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 18 Aug 2008 16:06:07 GMT
From:      Konrad Jankowski <konrad@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 147733 for review
Message-ID:  <200808181606.m7IG67l5068898@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=147733

Change 147733 by konrad@vspredator on 2008/08/18 16:05:58

	Make go.sh much more robust.
	It sets correct LC_COLLATE now, based on input file, and also
	can take an argument to test only one language.

Affected files ...

.. //depot/projects/soc2008/konrad_collation/test/regression/go.sh#2 edit

Differences ...

==== //depot/projects/soc2008/konrad_collation/test/regression/go.sh#2 (text+ko) ====

@@ -1,20 +1,34 @@
 #!/bin/sh
 
-SOURCE="../cldr_tests/*.xml"
+MASK="*"
+if [ "$1" != "" ]; then
+	MASK="$1"
+fi
+SOURCE="../cldr_tests/$MASK.xml"
 
-echo "1..`ls $SOURCE | wc -l | tr -d ' '`"
+#echo "1..`ls $SOURCE | wc -l | tr -d ' '`"
 for i in $SOURCE; do
 #	echo $i
-	./cut.sh ../cldr_tests/$i | tr -d '\r$' > orig
+	LOCALES=`grep ^locales $i | tail -n 1 |
+	    sed -e "s/.*='//g" -e "s/'.*//g"`
+	./cut.sh $i | tr -d '\r$' > orig
+#	echo "LOCALES: $LOCALES"
 	./randomize.pl < orig > unsorted
-	export PATH_LOCALE=../../locale
-	export LD_PRELOAD=../../libc/libc.so.7
-	sort < unsorted > sorted
+	for j in $LOCALES; do
+		DATAFILE=../../locale/$j.UTF-8
+		if ! test -d $DATAFILE; then
+#			echo "not ok # $DATAFILE does not exist"
+			continue
+		fi
+		env PATH_LOCALE=../../locale LD_PRELOAD=../../libc/libc.so.7 \
+		    LC_COLLATE=$j.UTF-8 sort < unsorted > sorted
 	
-	if cmp -s orig sorted; then
-		echo "ok # $i"
-	else
-		echo "not ok # $i"
-	fi
+		if cmp -s orig sorted; then
+			echo "ok # $i collation $j"
+		else
+			echo "not ok # $i collation $j"
+		fi
+	done
+#	exit
 done
 rm -f orig sorted unsorted



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200808181606.m7IG67l5068898>