From e88fdaeafec3a5c71a45829577efb169ffd762af Mon Sep 17 00:00:00 2001 From: rodrigc Date: Tue, 8 Sep 2015 17:54:31 +0000 Subject: [PATCH] Merge r286649: Fix and re-enable UTF-8 tests. X-Merge with: r287393 git-svn-id: svn://svn.freebsd.org/base/stable/10@287568 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- contrib/netbsd-tests/lib/libc/locale/t_mbrtowc.c | 10 ++++------ contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c | 6 ++---- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/contrib/netbsd-tests/lib/libc/locale/t_mbrtowc.c b/contrib/netbsd-tests/lib/libc/locale/t_mbrtowc.c index 8b3876fa7..e52111002 100644 --- a/contrib/netbsd-tests/lib/libc/locale/t_mbrtowc.c +++ b/contrib/netbsd-tests/lib/libc/locale/t_mbrtowc.c @@ -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", diff --git a/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c b/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c index f8c06d394..cd05d2590 100644 --- a/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c +++ b/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c @@ -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.45.0