d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix and re-enable UTF-8 tests.

Browse Source
This commit is contained in:
Jilles Tjoelker 2015-08-11 21:59:36 +00:00
parent 84dbb4b0d0
commit 5e0069c64c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=286649
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
contrib/netbsd-tests/lib/libc/locale/t_mbrtowc.c
View File

@ -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",

6
contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c
View File

@ -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

2
lib/libc/tests/locale/Makefile
View File

@ -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