From: Bruno Haible Date: Sat, 29 Jul 2023 22:16:24 +0000 (+0200) Subject: mbrtoc16 tests: Renumber tests. X-Git-Tag: v1.0~1001 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=561e995895e101040d1ac2ed010237d19286b925;p=gnulib.git mbrtoc16 tests: Renumber tests. * tests/test-mbrtoc16-*.sh: Renamed 1 -> 2 -> 3 -> 4 -> 5 -> 1. * tests/test-mbrtoc16.c: Update. * tests/test-mbrtoc16-w32-*.sh: Renamed 1 -> 2 -> 3 -> 5 -> 7 -> 4 -> 6 -> 8. * tests/test-mbrtoc16-w32.c: Update. * modules/mbrtoc16-tests: Update. --- diff --git a/ChangeLog b/ChangeLog index 4b1a2935e8..0105e2e8c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2023-07-29 Bruno Haible + mbrtoc16 tests: Renumber tests. + * tests/test-mbrtoc16-*.sh: Renamed 1 -> 2 -> 3 -> 4 -> 5 -> 1. + * tests/test-mbrtoc16.c: Update. + * tests/test-mbrtoc16-w32-*.sh: Renamed 1 -> 2 -> 3 -> 5 -> 7 -> 4 -> 6 + -> 8. + * tests/test-mbrtoc16-w32.c: Update. + * modules/mbrtoc16-tests: Update. + mbrtoc32 tests: Renumber tests. * tests/test-mbrtoc32-*.sh: Renamed 1 -> 2 -> 3 -> 4 -> 5 -> 1. * tests/test-mbrtoc32.c: Update. diff --git a/modules/mbrtoc16-tests b/modules/mbrtoc16-tests index 2ac7e0f0ee..298d945bc3 100644 --- a/modules/mbrtoc16-tests +++ b/modules/mbrtoc16-tests @@ -5,13 +5,13 @@ tests/test-mbrtoc16-3.sh tests/test-mbrtoc16-4.sh tests/test-mbrtoc16-5.sh tests/test-mbrtoc16.c -tests/test-mbrtoc16-w32-1.sh tests/test-mbrtoc16-w32-2.sh tests/test-mbrtoc16-w32-3.sh tests/test-mbrtoc16-w32-4.sh tests/test-mbrtoc16-w32-5.sh tests/test-mbrtoc16-w32-6.sh tests/test-mbrtoc16-w32-7.sh +tests/test-mbrtoc16-w32-8.sh tests/test-mbrtoc16-w32.c tests/signature.h tests/macros.h @@ -37,9 +37,9 @@ Makefile.am: TESTS += \ test-mbrtoc16-1.sh test-mbrtoc16-2.sh test-mbrtoc16-3.sh test-mbrtoc16-4.sh \ test-mbrtoc16-5.sh \ - test-mbrtoc16-w32-1.sh test-mbrtoc16-w32-2.sh test-mbrtoc16-w32-3.sh \ - test-mbrtoc16-w32-4.sh test-mbrtoc16-w32-5.sh test-mbrtoc16-w32-6.sh \ - test-mbrtoc16-w32-7.sh + test-mbrtoc16-w32-2.sh test-mbrtoc16-w32-3.sh test-mbrtoc16-w32-4.sh \ + test-mbrtoc16-w32-5.sh test-mbrtoc16-w32-6.sh test-mbrtoc16-w32-7.sh \ + test-mbrtoc16-w32-8.sh TESTS_ENVIRONMENT += \ LOCALE_FR='@LOCALE_FR@' \ LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \ diff --git a/tests/test-mbrtoc16-1.sh b/tests/test-mbrtoc16-1.sh index 811a57093c..4da6d64499 100755 --- a/tests/test-mbrtoc16-1.sh +++ b/tests/test-mbrtoc16-1.sh @@ -1,15 +1,9 @@ #!/bin/sh -# Test in an ISO-8859-1 or ISO-8859-15 locale. -: "${LOCALE_FR=fr_FR}" -if test $LOCALE_FR = none; then - if test -f /usr/bin/localedef; then - echo "Skipping test: no traditional french locale is installed" - else - echo "Skipping test: no traditional french locale is supported" - fi - exit 77 -fi +# Test whether the POSIX locale has encoding errors. +LC_ALL=C \ +${CHECKER} ./test-mbrtoc16${EXEEXT} 1 || exit 1 +LC_ALL=POSIX \ +${CHECKER} ./test-mbrtoc16${EXEEXT} 1 || exit 1 -LC_ALL=$LOCALE_FR \ -${CHECKER} ./test-mbrtoc16${EXEEXT} 1 +exit 0 diff --git a/tests/test-mbrtoc16-2.sh b/tests/test-mbrtoc16-2.sh index aa2e9d84ba..9010038466 100755 --- a/tests/test-mbrtoc16-2.sh +++ b/tests/test-mbrtoc16-2.sh @@ -1,15 +1,15 @@ #!/bin/sh -# Test whether a specific UTF-8 locale is installed. -: "${LOCALE_FR_UTF8=fr_FR.UTF-8}" -if test $LOCALE_FR_UTF8 = none; then +# Test in an ISO-8859-1 or ISO-8859-15 locale. +: "${LOCALE_FR=fr_FR}" +if test $LOCALE_FR = none; then if test -f /usr/bin/localedef; then - echo "Skipping test: no french Unicode locale is installed" + echo "Skipping test: no traditional french locale is installed" else - echo "Skipping test: no french Unicode locale is supported" + echo "Skipping test: no traditional french locale is supported" fi exit 77 fi -LC_ALL=$LOCALE_FR_UTF8 \ +LC_ALL=$LOCALE_FR \ ${CHECKER} ./test-mbrtoc16${EXEEXT} 2 diff --git a/tests/test-mbrtoc16-3.sh b/tests/test-mbrtoc16-3.sh index b58bb4aab2..d4104816ca 100755 --- a/tests/test-mbrtoc16-3.sh +++ b/tests/test-mbrtoc16-3.sh @@ -1,15 +1,15 @@ #!/bin/sh -# Test whether a specific EUC-JP locale is installed. -: "${LOCALE_JA=ja_JP}" -if test $LOCALE_JA = none; then +# Test whether a specific UTF-8 locale is installed. +: "${LOCALE_FR_UTF8=fr_FR.UTF-8}" +if test $LOCALE_FR_UTF8 = none; then if test -f /usr/bin/localedef; then - echo "Skipping test: no traditional japanese locale is installed" + echo "Skipping test: no french Unicode locale is installed" else - echo "Skipping test: no traditional japanese locale is supported" + echo "Skipping test: no french Unicode locale is supported" fi exit 77 fi -LC_ALL=$LOCALE_JA \ +LC_ALL=$LOCALE_FR_UTF8 \ ${CHECKER} ./test-mbrtoc16${EXEEXT} 3 diff --git a/tests/test-mbrtoc16-4.sh b/tests/test-mbrtoc16-4.sh index 8fa66efe21..826feb5c1e 100755 --- a/tests/test-mbrtoc16-4.sh +++ b/tests/test-mbrtoc16-4.sh @@ -1,15 +1,15 @@ #!/bin/sh -# Test whether a specific GB18030 locale is installed. -: "${LOCALE_ZH_CN=zh_CN.GB18030}" -if test $LOCALE_ZH_CN = none; then +# Test whether a specific EUC-JP locale is installed. +: "${LOCALE_JA=ja_JP}" +if test $LOCALE_JA = none; then if test -f /usr/bin/localedef; then - echo "Skipping test: no transitional chinese locale is installed" + echo "Skipping test: no traditional japanese locale is installed" else - echo "Skipping test: no transitional chinese locale is supported" + echo "Skipping test: no traditional japanese locale is supported" fi exit 77 fi -LC_ALL=$LOCALE_ZH_CN \ +LC_ALL=$LOCALE_JA \ ${CHECKER} ./test-mbrtoc16${EXEEXT} 4 diff --git a/tests/test-mbrtoc16-5.sh b/tests/test-mbrtoc16-5.sh index 71affee23d..ae12ae9002 100755 --- a/tests/test-mbrtoc16-5.sh +++ b/tests/test-mbrtoc16-5.sh @@ -1,9 +1,15 @@ #!/bin/sh -# Test whether the POSIX locale has encoding errors. -LC_ALL=C \ -${CHECKER} ./test-mbrtoc16${EXEEXT} 5 || exit 1 -LC_ALL=POSIX \ -${CHECKER} ./test-mbrtoc16${EXEEXT} 5 || exit 1 +# Test whether a specific GB18030 locale is installed. +: "${LOCALE_ZH_CN=zh_CN.GB18030}" +if test $LOCALE_ZH_CN = none; then + if test -f /usr/bin/localedef; then + echo "Skipping test: no transitional chinese locale is installed" + else + echo "Skipping test: no transitional chinese locale is supported" + fi + exit 77 +fi -exit 0 +LC_ALL=$LOCALE_ZH_CN \ +${CHECKER} ./test-mbrtoc16${EXEEXT} 5 diff --git a/tests/test-mbrtoc16-w32-1.sh b/tests/test-mbrtoc16-w32-1.sh deleted file mode 100755 index db19c943ac..0000000000 --- a/tests/test-mbrtoc16-w32-1.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -# Test a CP1252 locale. -${CHECKER} ./test-mbrtoc16-w32${EXEEXT} French_France 1252 diff --git a/tests/test-mbrtoc16-w32-2.sh b/tests/test-mbrtoc16-w32-2.sh index 05d4cef17f..db19c943ac 100755 --- a/tests/test-mbrtoc16-w32-2.sh +++ b/tests/test-mbrtoc16-w32-2.sh @@ -1,4 +1,4 @@ #!/bin/sh -# Test a CP1256 locale. -${CHECKER} ./test-mbrtoc16-w32${EXEEXT} "Arabic_Saudi Arabia" 1256 +# Test a CP1252 locale. +${CHECKER} ./test-mbrtoc16-w32${EXEEXT} French_France 1252 diff --git a/tests/test-mbrtoc16-w32-3.sh b/tests/test-mbrtoc16-w32-3.sh index f00830011c..05d4cef17f 100755 --- a/tests/test-mbrtoc16-w32-3.sh +++ b/tests/test-mbrtoc16-w32-3.sh @@ -1,4 +1,4 @@ #!/bin/sh -# Test a CP932 locale. -${CHECKER} ./test-mbrtoc16-w32${EXEEXT} Japanese_Japan 932 +# Test a CP1256 locale. +${CHECKER} ./test-mbrtoc16-w32${EXEEXT} "Arabic_Saudi Arabia" 1256 diff --git a/tests/test-mbrtoc16-w32-4.sh b/tests/test-mbrtoc16-w32-4.sh index f4cdff6838..44ddd7e303 100755 --- a/tests/test-mbrtoc16-w32-4.sh +++ b/tests/test-mbrtoc16-w32-4.sh @@ -1,4 +1,4 @@ #!/bin/sh -# Test a CP950 locale. -${CHECKER} ./test-mbrtoc16-w32${EXEEXT} Chinese_Taiwan 950 +# Test some UTF-8 locales. +${CHECKER} ./test-mbrtoc16-w32${EXEEXT} French_France Japanese_Japan Chinese_Taiwan Chinese_China 65001 diff --git a/tests/test-mbrtoc16-w32-5.sh b/tests/test-mbrtoc16-w32-5.sh index f7685a4533..f00830011c 100755 --- a/tests/test-mbrtoc16-w32-5.sh +++ b/tests/test-mbrtoc16-w32-5.sh @@ -1,4 +1,4 @@ #!/bin/sh -# Test a CP936 locale. -${CHECKER} ./test-mbrtoc16-w32${EXEEXT} Chinese_China 936 +# Test a CP932 locale. +${CHECKER} ./test-mbrtoc16-w32${EXEEXT} Japanese_Japan 932 diff --git a/tests/test-mbrtoc16-w32-6.sh b/tests/test-mbrtoc16-w32-6.sh index a695af94f9..f4cdff6838 100755 --- a/tests/test-mbrtoc16-w32-6.sh +++ b/tests/test-mbrtoc16-w32-6.sh @@ -1,4 +1,4 @@ #!/bin/sh -# Test a GB18030 locale. -${CHECKER} ./test-mbrtoc16-w32${EXEEXT} Chinese_China 54936 +# Test a CP950 locale. +${CHECKER} ./test-mbrtoc16-w32${EXEEXT} Chinese_Taiwan 950 diff --git a/tests/test-mbrtoc16-w32-7.sh b/tests/test-mbrtoc16-w32-7.sh index 44ddd7e303..f7685a4533 100755 --- a/tests/test-mbrtoc16-w32-7.sh +++ b/tests/test-mbrtoc16-w32-7.sh @@ -1,4 +1,4 @@ #!/bin/sh -# Test some UTF-8 locales. -${CHECKER} ./test-mbrtoc16-w32${EXEEXT} French_France Japanese_Japan Chinese_Taiwan Chinese_China 65001 +# Test a CP936 locale. +${CHECKER} ./test-mbrtoc16-w32${EXEEXT} Chinese_China 936 diff --git a/tests/test-mbrtoc16-w32-8.sh b/tests/test-mbrtoc16-w32-8.sh new file mode 100755 index 0000000000..a695af94f9 --- /dev/null +++ b/tests/test-mbrtoc16-w32-8.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +# Test a GB18030 locale. +${CHECKER} ./test-mbrtoc16-w32${EXEEXT} Chinese_China 54936 diff --git a/tests/test-mbrtoc16-w32.c b/tests/test-mbrtoc16-w32.c index c7aef287d5..10ebf6424a 100644 --- a/tests/test-mbrtoc16-w32.c +++ b/tests/test-mbrtoc16-w32.c @@ -263,6 +263,144 @@ test_one_locale (const char *name, int codepage) } return 0; + case 65001: + /* Locale encoding is CP65001 = UTF-8. */ + if (strcmp (locale_charset (), "UTF-8") != 0) + return 77; + { + char input[] = "s\303\274\303\237\360\237\230\213!"; /* "süß😋!" */ + memset (&state, '\0', sizeof (mbstate_t)); + + wc = (char16_t) 0xBADF; + ret = mbrtoc16 (&wc, input, 1, &state); + ASSERT (ret == 1); + ASSERT (wc == 's'); + ASSERT (mbsinit (&state)); + input[0] = '\0'; + + wc = (char16_t) 0xBADF; + ret = mbrtoc16 (&wc, input + 1, 1, &state); + ASSERT (ret == (size_t)(-2)); + ASSERT (wc == (char16_t) 0xBADF); + #if 0 + ASSERT (!mbsinit (&state)); + #endif + input[1] = '\0'; + + wc = (char16_t) 0xBADF; + ret = mbrtoc16 (&wc, input + 2, 7, &state); + ASSERT (ret == 1); + ASSERT (c32tob (wc) == EOF); + ASSERT (wc == 0x00FC); + ASSERT (mbsinit (&state)); + input[2] = '\0'; + + /* Test support of NULL first argument. */ + ret = mbrtoc16 (NULL, input + 3, 6, &state); + ASSERT (ret == 2); + ASSERT (mbsinit (&state)); + + wc = (char16_t) 0xBADF; + ret = mbrtoc16 (&wc, input + 3, 6, &state); + ASSERT (ret == 2); + ASSERT (c32tob (wc) == EOF); + ASSERT (wc == 0x00DF); + ASSERT (mbsinit (&state)); + input[3] = '\0'; + input[4] = '\0'; + + /* Test support of NULL first argument. */ + ret = mbrtoc16 (NULL, input + 5, 4, &state); + ASSERT (ret == 4); + ret = mbrtoc16 (NULL, input + 9, 0, &state); + ASSERT (ret == (size_t)(-3)); + ASSERT (mbsinit (&state)); + + wc = (char16_t) 0xBADF; + ret = mbrtoc16 (&wc, input + 5, 4, &state); + ASSERT (ret == 4); + ASSERT (c32tob (wc) == EOF); + ASSERT (wc == 0xD83D); /* expect UTF-16 encoding */ + input[5] = '\0'; + input[6] = '\0'; + input[7] = '\0'; + input[8] = '\0'; + wc = (char16_t) 0xBADF; + ret = mbrtoc16 (&wc, input + 9, 0, &state); + ASSERT (ret == (size_t)(-3)); + ASSERT (c32tob (wc) == EOF); + ASSERT (wc == 0xDE0B); /* expect UTF-16 encoding */ + ASSERT (mbsinit (&state)); + + wc = (char16_t) 0xBADF; + ret = mbrtoc16 (&wc, input + 9, 1, &state); + ASSERT (ret == 1); + ASSERT (wc == '!'); + ASSERT (mbsinit (&state)); + + /* Test some invalid input. */ + memset (&state, '\0', sizeof (mbstate_t)); + wc = (char16_t) 0xBADF; + ret = mbrtoc16 (&wc, "\377", 1, &state); /* 0xFF */ + ASSERT (ret == (size_t)-1); + ASSERT (errno == EILSEQ); + + memset (&state, '\0', sizeof (mbstate_t)); + wc = (char16_t) 0xBADF; + ret = mbrtoc16 (&wc, "\303\300", 2, &state); /* 0xC3 0xC0 */ + ASSERT (ret == (size_t)-1); + ASSERT (errno == EILSEQ); + + memset (&state, '\0', sizeof (mbstate_t)); + wc = (char16_t) 0xBADF; + ret = mbrtoc16 (&wc, "\343\300", 2, &state); /* 0xE3 0xC0 */ + ASSERT (ret == (size_t)-1); + ASSERT (errno == EILSEQ); + + memset (&state, '\0', sizeof (mbstate_t)); + wc = (char16_t) 0xBADF; + ret = mbrtoc16 (&wc, "\343\300\200", 3, &state); /* 0xE3 0xC0 0x80 */ + ASSERT (ret == (size_t)-1); + ASSERT (errno == EILSEQ); + + memset (&state, '\0', sizeof (mbstate_t)); + wc = (char16_t) 0xBADF; + ret = mbrtoc16 (&wc, "\343\200\300", 3, &state); /* 0xE3 0x80 0xC0 */ + ASSERT (ret == (size_t)-1); + ASSERT (errno == EILSEQ); + + memset (&state, '\0', sizeof (mbstate_t)); + wc = (char16_t) 0xBADF; + ret = mbrtoc16 (&wc, "\363\300", 2, &state); /* 0xF3 0xC0 */ + ASSERT (ret == (size_t)-1); + ASSERT (errno == EILSEQ); + + memset (&state, '\0', sizeof (mbstate_t)); + wc = (char16_t) 0xBADF; + ret = mbrtoc16 (&wc, "\363\300\200\200", 4, &state); /* 0xF3 0xC0 0x80 0x80 */ + ASSERT (ret == (size_t)-1); + ASSERT (errno == EILSEQ); + + memset (&state, '\0', sizeof (mbstate_t)); + wc = (char16_t) 0xBADF; + ret = mbrtoc16 (&wc, "\363\200\300", 3, &state); /* 0xF3 0x80 0xC0 */ + ASSERT (ret == (size_t)-1); + ASSERT (errno == EILSEQ); + + memset (&state, '\0', sizeof (mbstate_t)); + wc = (char16_t) 0xBADF; + ret = mbrtoc16 (&wc, "\363\200\300\200", 4, &state); /* 0xF3 0x80 0xC0 0x80 */ + ASSERT (ret == (size_t)-1); + ASSERT (errno == EILSEQ); + + memset (&state, '\0', sizeof (mbstate_t)); + wc = (char16_t) 0xBADF; + ret = mbrtoc16 (&wc, "\363\200\200\300", 4, &state); /* 0xF3 0x80 0x80 0xC0 */ + ASSERT (ret == (size_t)-1); + ASSERT (errno == EILSEQ); + } + return 0; + case 932: /* Locale encoding is CP932, similar to Shift_JIS. */ { @@ -595,144 +733,6 @@ test_one_locale (const char *name, int codepage) } return 0; - case 65001: - /* Locale encoding is CP65001 = UTF-8. */ - if (strcmp (locale_charset (), "UTF-8") != 0) - return 77; - { - char input[] = "s\303\274\303\237\360\237\230\213!"; /* "süß😋!" */ - memset (&state, '\0', sizeof (mbstate_t)); - - wc = (char16_t) 0xBADF; - ret = mbrtoc16 (&wc, input, 1, &state); - ASSERT (ret == 1); - ASSERT (wc == 's'); - ASSERT (mbsinit (&state)); - input[0] = '\0'; - - wc = (char16_t) 0xBADF; - ret = mbrtoc16 (&wc, input + 1, 1, &state); - ASSERT (ret == (size_t)(-2)); - ASSERT (wc == (char16_t) 0xBADF); - #if 0 - ASSERT (!mbsinit (&state)); - #endif - input[1] = '\0'; - - wc = (char16_t) 0xBADF; - ret = mbrtoc16 (&wc, input + 2, 7, &state); - ASSERT (ret == 1); - ASSERT (c32tob (wc) == EOF); - ASSERT (wc == 0x00FC); - ASSERT (mbsinit (&state)); - input[2] = '\0'; - - /* Test support of NULL first argument. */ - ret = mbrtoc16 (NULL, input + 3, 6, &state); - ASSERT (ret == 2); - ASSERT (mbsinit (&state)); - - wc = (char16_t) 0xBADF; - ret = mbrtoc16 (&wc, input + 3, 6, &state); - ASSERT (ret == 2); - ASSERT (c32tob (wc) == EOF); - ASSERT (wc == 0x00DF); - ASSERT (mbsinit (&state)); - input[3] = '\0'; - input[4] = '\0'; - - /* Test support of NULL first argument. */ - ret = mbrtoc16 (NULL, input + 5, 4, &state); - ASSERT (ret == 4); - ret = mbrtoc16 (NULL, input + 9, 0, &state); - ASSERT (ret == (size_t)(-3)); - ASSERT (mbsinit (&state)); - - wc = (char16_t) 0xBADF; - ret = mbrtoc16 (&wc, input + 5, 4, &state); - ASSERT (ret == 4); - ASSERT (c32tob (wc) == EOF); - ASSERT (wc == 0xD83D); /* expect UTF-16 encoding */ - input[5] = '\0'; - input[6] = '\0'; - input[7] = '\0'; - input[8] = '\0'; - wc = (char16_t) 0xBADF; - ret = mbrtoc16 (&wc, input + 9, 0, &state); - ASSERT (ret == (size_t)(-3)); - ASSERT (c32tob (wc) == EOF); - ASSERT (wc == 0xDE0B); /* expect UTF-16 encoding */ - ASSERT (mbsinit (&state)); - - wc = (char16_t) 0xBADF; - ret = mbrtoc16 (&wc, input + 9, 1, &state); - ASSERT (ret == 1); - ASSERT (wc == '!'); - ASSERT (mbsinit (&state)); - - /* Test some invalid input. */ - memset (&state, '\0', sizeof (mbstate_t)); - wc = (char16_t) 0xBADF; - ret = mbrtoc16 (&wc, "\377", 1, &state); /* 0xFF */ - ASSERT (ret == (size_t)-1); - ASSERT (errno == EILSEQ); - - memset (&state, '\0', sizeof (mbstate_t)); - wc = (char16_t) 0xBADF; - ret = mbrtoc16 (&wc, "\303\300", 2, &state); /* 0xC3 0xC0 */ - ASSERT (ret == (size_t)-1); - ASSERT (errno == EILSEQ); - - memset (&state, '\0', sizeof (mbstate_t)); - wc = (char16_t) 0xBADF; - ret = mbrtoc16 (&wc, "\343\300", 2, &state); /* 0xE3 0xC0 */ - ASSERT (ret == (size_t)-1); - ASSERT (errno == EILSEQ); - - memset (&state, '\0', sizeof (mbstate_t)); - wc = (char16_t) 0xBADF; - ret = mbrtoc16 (&wc, "\343\300\200", 3, &state); /* 0xE3 0xC0 0x80 */ - ASSERT (ret == (size_t)-1); - ASSERT (errno == EILSEQ); - - memset (&state, '\0', sizeof (mbstate_t)); - wc = (char16_t) 0xBADF; - ret = mbrtoc16 (&wc, "\343\200\300", 3, &state); /* 0xE3 0x80 0xC0 */ - ASSERT (ret == (size_t)-1); - ASSERT (errno == EILSEQ); - - memset (&state, '\0', sizeof (mbstate_t)); - wc = (char16_t) 0xBADF; - ret = mbrtoc16 (&wc, "\363\300", 2, &state); /* 0xF3 0xC0 */ - ASSERT (ret == (size_t)-1); - ASSERT (errno == EILSEQ); - - memset (&state, '\0', sizeof (mbstate_t)); - wc = (char16_t) 0xBADF; - ret = mbrtoc16 (&wc, "\363\300\200\200", 4, &state); /* 0xF3 0xC0 0x80 0x80 */ - ASSERT (ret == (size_t)-1); - ASSERT (errno == EILSEQ); - - memset (&state, '\0', sizeof (mbstate_t)); - wc = (char16_t) 0xBADF; - ret = mbrtoc16 (&wc, "\363\200\300", 3, &state); /* 0xF3 0x80 0xC0 */ - ASSERT (ret == (size_t)-1); - ASSERT (errno == EILSEQ); - - memset (&state, '\0', sizeof (mbstate_t)); - wc = (char16_t) 0xBADF; - ret = mbrtoc16 (&wc, "\363\200\300\200", 4, &state); /* 0xF3 0x80 0xC0 0x80 */ - ASSERT (ret == (size_t)-1); - ASSERT (errno == EILSEQ); - - memset (&state, '\0', sizeof (mbstate_t)); - wc = (char16_t) 0xBADF; - ret = mbrtoc16 (&wc, "\363\200\200\300", 4, &state); /* 0xF3 0x80 0x80 0xC0 */ - ASSERT (ret == (size_t)-1); - ASSERT (errno == EILSEQ); - } - return 0; - default: return 1; } diff --git a/tests/test-mbrtoc16.c b/tests/test-mbrtoc16.c index 03732dddb4..b76a9bed28 100644 --- a/tests/test-mbrtoc16.c +++ b/tests/test-mbrtoc16.c @@ -131,14 +131,50 @@ main (int argc, char *argv[]) "C" locale. Furthermore, when you attempt to set the "C" or "POSIX" locale via setlocale(), what you get is a "C" locale with UTF-8 encoding, that is, effectively the "C.UTF-8" locale. */ - if (argc > 1 && strcmp (argv[1], "5") == 0 && MB_CUR_MAX > 1) - argv[1] = "2"; + if (argc > 1 && strcmp (argv[1], "1") == 0 && MB_CUR_MAX > 1) + argv[1] = "3"; #endif if (argc > 1) switch (argv[1][0]) { case '1': + /* C or POSIX locale. */ + { + int c; + char buf[1]; + + memset (&state, '\0', sizeof (mbstate_t)); + for (c = 0; c < 0x100; c++) + if (c != 0) + { + /* We are testing all nonnull bytes. */ + buf[0] = c; + + wc = (char16_t) 0xBADF; + ret = mbrtoc16 (&wc, buf, 1, &state); + /* POSIX:2018 says regarding mbrtowc: "In the POSIX locale an + [EILSEQ] error cannot occur since all byte values are valid + characters." It is reasonable to expect mbrtoc16 to behave + in the same way. */ + ASSERT (ret == 1); + if (c < 0x80) + /* c is an ASCII character. */ + ASSERT (wc == c); + else + /* On most platforms, the bytes 0x80..0xFF map to U+0080..U+00FF. + But on musl libc, the bytes 0x80..0xFF map to U+DF80..U+DFFF. */ + ASSERT (wc == (btoc32 (c) == 0xDF00 + c ? btoc32 (c) : c)); + ASSERT (mbsinit (&state)); + + ret = mbrtoc16 (NULL, buf, 1, &state); + ASSERT (ret == 1); + ASSERT (mbsinit (&state)); + } + } + return 0; + + case '2': /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ { char input[] = "B\374\337er"; /* "Büßer" */ @@ -187,7 +223,7 @@ main (int argc, char *argv[]) } return 0; - case '2': + case '3': /* Locale encoding is UTF-8. */ { char input[] = "s\303\274\303\237\360\237\230\213!"; /* "süß😋!" */ @@ -262,7 +298,7 @@ main (int argc, char *argv[]) } return 0; - case '3': + case '4': /* Locale encoding is EUC-JP. */ { char input[] = "<\306\374\313\334\270\354>"; /* "<日本語>" */ @@ -323,7 +359,7 @@ main (int argc, char *argv[]) } return 0; - case '4': + case '5': /* Locale encoding is GB18030. */ #if GL_CHAR32_T_IS_UNICODE && (defined __NetBSD__ || defined __sun) fputs ("Skipping test: The GB18030 converter in this system's iconv is broken.\n", stderr); @@ -403,42 +439,6 @@ main (int argc, char *argv[]) ASSERT (mbsinit (&state)); } return 0; - - case '5': - /* C or POSIX locale. */ - { - int c; - char buf[1]; - - memset (&state, '\0', sizeof (mbstate_t)); - for (c = 0; c < 0x100; c++) - if (c != 0) - { - /* We are testing all nonnull bytes. */ - buf[0] = c; - - wc = (char16_t) 0xBADF; - ret = mbrtoc16 (&wc, buf, 1, &state); - /* POSIX:2018 says regarding mbrtowc: "In the POSIX locale an - [EILSEQ] error cannot occur since all byte values are valid - characters." It is reasonable to expect mbrtoc16 to behave - in the same way. */ - ASSERT (ret == 1); - if (c < 0x80) - /* c is an ASCII character. */ - ASSERT (wc == c); - else - /* On most platforms, the bytes 0x80..0xFF map to U+0080..U+00FF. - But on musl libc, the bytes 0x80..0xFF map to U+DF80..U+DFFF. */ - ASSERT (wc == (btoc32 (c) == 0xDF00 + c ? btoc32 (c) : c)); - ASSERT (mbsinit (&state)); - - ret = mbrtoc16 (NULL, buf, 1, &state); - ASSERT (ret == 1); - ASSERT (mbsinit (&state)); - } - } - return 0; } return 1;