Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 11 Aug 2015 21:59:36 +0000 (UTC)
From:      Jilles Tjoelker <jilles@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r286649 - in head: contrib/netbsd-tests/lib/libc/locale lib/libc/tests/locale
Message-ID:  <201508112159.t7BLxa6U057950@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jilles
Date: Tue Aug 11 21:59:36 2015
New Revision: 286649
URL: https://svnweb.freebsd.org/changeset/base/286649

Log:
  Fix and re-enable UTF-8 tests.

Modified:
  head/contrib/netbsd-tests/lib/libc/locale/t_mbrtowc.c
  head/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c
  head/lib/libc/tests/locale/Makefile

Modified: head/contrib/netbsd-tests/lib/libc/locale/t_mbrtowc.c
==============================================================================
--- head/contrib/netbsd-tests/lib/libc/locale/t_mbrtowc.c	Tue Aug 11 19:25:26 2015	(r286648)
+++ head/contrib/netbsd-tests/lib/libc/locale/t_mbrtowc.c	Tue Aug 11 21:59:36 2015	(r286649)
@@ -88,13 +88,11 @@ static struct test {
 }, {
 	"en_US.UTF-8",
 	"[\001\177][\302\200\337\277][\340\240\200\357\277\277][\360\220\200"
-	"\200\367\277\277\277][\370\210\200\200\200\373\277\277\277\277][\374"
-	"\204\200\200\200\200\375\277\277\277\277\277]",
+	"\200\364\217\277\277]",
 	{ 0x5b, 0x01, 0x7f, 0x5d, 0x5b, 0x80, 0x7ff, 0x5d, 0x5b, 0x800, 0xffff,
-	  0x5d, 0x5b, 0x10000, 0x1fffff, 0x5d, 0x5b, 0x200000, 0x3ffffff, 0x5d,
-	  0x5b, 0x4000000, 0x7fffffff, 0x5d },
-	{ 1, 1, 1, 1, 1, 2, 2, 1, 1, 3, 3, 1, 1, 4, 4, 1, 1, 5, 5, 1, 1, 6, 6, 1 },
-	24
+	  0x5d, 0x5b, 0x10000, 0x10ffff, 0x5d },
+	{ 1, 1, 1, 1, 1, 2, 2, 1, 1, 3, 3, 1, 1, 4, 4, 1 },
+	16
 }, {
 	"ja_JP.ISO2022-JP2",
 	"\033$BF|K\1348l\033(BA\033$B$\"\033(BB\033$B$$\033(B",

Modified: head/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c
==============================================================================
--- head/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c	Tue Aug 11 19:25:26 2015	(r286648)
+++ head/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c	Tue Aug 11 21:59:36 2015	(r286649)
@@ -82,12 +82,10 @@ static struct test {
 {
 	"en_US.UTF-8",
 	"[\001\177][\302\200\337\277][\340\240\200\357\277\277][\360\220\200"
-	"\200\367\277\277\277][\370\210\200\200\200\373\277\277\277\277][\374"
-	"\204\200\200\200\200\375\277\277\277\277\277]",
+	"\200\364\217\277\277]",
 	{
 		0x5B, 0x01, 0x7F, 0x5D, 0x5B, 0x80, 0x07FF, 0x5D, 0x5B, 0x0800,
-		0xFFFF, 0x5D, 0x5B, 0x10000, 0x1FFFFF, 0x5D, 0x5B, 0x200000,
-		0x3FFFFFF, 0x5D, 0x5B, 0x4000000, 0x7FFFFFFF, 0x5D, 0x0A
+		0xFFFF, 0x5D, 0x5B, 0x10000, 0x10FFFF, 0x5D, 0x0A
 	},
 	{	 1, -1, -1,  1,  1, -1, -1,  1,  1, -1, -1,  1,  1, -1, -1,
 		 1,  1, -1, -1,  1,  1, -1, -1,  1, -1

Modified: head/lib/libc/tests/locale/Makefile
==============================================================================
--- head/lib/libc/tests/locale/Makefile	Tue Aug 11 19:25:26 2015	(r286648)
+++ head/lib/libc/tests/locale/Makefile	Tue Aug 11 21:59:36 2015	(r286649)
@@ -6,7 +6,7 @@ TESTSDIR=	${TESTSBASE}/lib/libc/locale
 
 NETBSD_ATF_TESTS_C=	io_test
 NETBSD_ATF_TESTS_C+=	mbrtowc_test
-#NETBSD_ATF_TESTS_C+=	mbstowcs_test
+NETBSD_ATF_TESTS_C+=	mbstowcs_test
 NETBSD_ATF_TESTS_C+=	mbsnrtowcs_test
 NETBSD_ATF_TESTS_C+=	mbtowc_test
 NETBSD_ATF_TESTS_C+=	wcscspn_test



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