From owner-p4-projects@FreeBSD.ORG  Mon Aug 18 16:06:08 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E7DE31065682; Mon, 18 Aug 2008 16:06:07 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 745561065676
	for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 16:06:07 +0000 (UTC)
	(envelope-from konrad@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 600DC8FC21
	for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 16:06:07 +0000 (UTC)
	(envelope-from konrad@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7IG67tQ068900
	for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 16:06:07 GMT
	(envelope-from konrad@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7IG67l5068898
	for perforce@freebsd.org; Mon, 18 Aug 2008 16:06:07 GMT
	(envelope-from konrad@FreeBSD.org)
Date: Mon, 18 Aug 2008 16:06:07 GMT
Message-Id: <200808181606.m7IG67l5068898@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	konrad@FreeBSD.org using -f
From: Konrad Jankowski <konrad@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 147733 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Aug 2008 16:06:08 -0000

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