From 6646bf2eb287fee83c3086d492d6c42ece8fc346 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 29 Jul 2023 23:18:42 +0200 Subject: [PATCH] mbrlen tests: Renumber tests. * tests/test-mbrlen*.sh: Renamed 1 -> 2 -> 3 -> 4 -> 5 -> 1. * tests/test-mbrlen.c: Update. * tests/test-mbrlen-w32-*.sh: Renamed 1 -> 2 -> 3 -> 5 -> 7 -> 4 -> 6 -> 8. * tests/test-mbrlen-w32.c: Update. * modules/mbrlen-tests: Update. --- ChangeLog | 8 + modules/mbrlen-tests | 22 +-- tests/{test-mbrlen5.sh => test-mbrlen-1.sh} | 4 +- tests/{test-mbrlen1.sh => test-mbrlen-2.sh} | 2 +- tests/{test-mbrlen2.sh => test-mbrlen-3.sh} | 2 +- tests/{test-mbrlen3.sh => test-mbrlen-4.sh} | 2 +- tests/{test-mbrlen4.sh => test-mbrlen-5.sh} | 2 +- tests/test-mbrlen-w32-1.sh | 4 - tests/test-mbrlen-w32-2.sh | 4 +- tests/test-mbrlen-w32-3.sh | 4 +- tests/test-mbrlen-w32-4.sh | 4 +- tests/test-mbrlen-w32-5.sh | 4 +- tests/test-mbrlen-w32-6.sh | 4 +- tests/test-mbrlen-w32-7.sh | 4 +- tests/test-mbrlen-w32-8.sh | 4 + tests/test-mbrlen-w32.c | 182 ++++++++++---------- tests/test-mbrlen.c | 54 +++--- 17 files changed, 159 insertions(+), 151 deletions(-) rename tests/{test-mbrlen5.sh => test-mbrlen-1.sh} (51%) rename tests/{test-mbrlen1.sh => test-mbrlen-2.sh} (90%) rename tests/{test-mbrlen2.sh => test-mbrlen-3.sh} (90%) rename tests/{test-mbrlen3.sh => test-mbrlen-4.sh} (90%) rename tests/{test-mbrlen4.sh => test-mbrlen-5.sh} (90%) delete mode 100755 tests/test-mbrlen-w32-1.sh create mode 100755 tests/test-mbrlen-w32-8.sh diff --git a/ChangeLog b/ChangeLog index 18deab3fa0..3c7c412592 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2023-07-29 Bruno Haible + mbrlen tests: Renumber tests. + * tests/test-mbrlen*.sh: Renamed 1 -> 2 -> 3 -> 4 -> 5 -> 1. + * tests/test-mbrlen.c: Update. + * tests/test-mbrlen-w32-*.sh: Renamed 1 -> 2 -> 3 -> 5 -> 7 -> 4 -> 6 + -> 8. + * tests/test-mbrlen-w32.c: Update. + * modules/mbrlen-tests: Update. + mbmemcasecoll tests: Renumber tests. * tests/test-mbmemcasecoll*.sh: Renamed 1 -> 2 -> 3 -> 4. * tests/test-mbmemcasecoll.c: Update. diff --git a/modules/mbrlen-tests b/modules/mbrlen-tests index bd2091bc4d..18878eb1d1 100644 --- a/modules/mbrlen-tests +++ b/modules/mbrlen-tests @@ -1,17 +1,17 @@ Files: -tests/test-mbrlen1.sh -tests/test-mbrlen2.sh -tests/test-mbrlen3.sh -tests/test-mbrlen4.sh -tests/test-mbrlen5.sh +tests/test-mbrlen-1.sh +tests/test-mbrlen-2.sh +tests/test-mbrlen-3.sh +tests/test-mbrlen-4.sh +tests/test-mbrlen-5.sh tests/test-mbrlen.c -tests/test-mbrlen-w32-1.sh tests/test-mbrlen-w32-2.sh tests/test-mbrlen-w32-3.sh tests/test-mbrlen-w32-4.sh tests/test-mbrlen-w32-5.sh tests/test-mbrlen-w32-6.sh tests/test-mbrlen-w32-7.sh +tests/test-mbrlen-w32-8.sh tests/test-mbrlen-w32.c tests/signature.h tests/macros.h @@ -34,11 +34,11 @@ gt_LOCALE_ZH_CN Makefile.am: TESTS += \ - test-mbrlen1.sh test-mbrlen2.sh test-mbrlen3.sh test-mbrlen4.sh \ - test-mbrlen5.sh \ - test-mbrlen-w32-1.sh test-mbrlen-w32-2.sh test-mbrlen-w32-3.sh \ - test-mbrlen-w32-4.sh test-mbrlen-w32-5.sh test-mbrlen-w32-6.sh \ - test-mbrlen-w32-7.sh + test-mbrlen-1.sh test-mbrlen-2.sh test-mbrlen-3.sh test-mbrlen-4.sh \ + test-mbrlen-5.sh \ + test-mbrlen-w32-2.sh test-mbrlen-w32-3.sh test-mbrlen-w32-4.sh \ + test-mbrlen-w32-5.sh test-mbrlen-w32-6.sh test-mbrlen-w32-7.sh \ + test-mbrlen-w32-8.sh TESTS_ENVIRONMENT += \ LOCALE_FR='@LOCALE_FR@' \ LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \ diff --git a/tests/test-mbrlen5.sh b/tests/test-mbrlen-1.sh similarity index 51% rename from tests/test-mbrlen5.sh rename to tests/test-mbrlen-1.sh index 9b14cb1e1c..8feabf822b 100755 --- a/tests/test-mbrlen5.sh +++ b/tests/test-mbrlen-1.sh @@ -2,8 +2,8 @@ # Test whether the POSIX locale has encoding errors. LC_ALL=C \ -${CHECKER} ./test-mbrlen${EXEEXT} 5 || exit 1 +${CHECKER} ./test-mbrlen${EXEEXT} 1 || exit 1 LC_ALL=POSIX \ -${CHECKER} ./test-mbrlen${EXEEXT} 5 || exit 1 +${CHECKER} ./test-mbrlen${EXEEXT} 1 || exit 1 exit 0 diff --git a/tests/test-mbrlen1.sh b/tests/test-mbrlen-2.sh similarity index 90% rename from tests/test-mbrlen1.sh rename to tests/test-mbrlen-2.sh index f07bc37e96..200142d086 100755 --- a/tests/test-mbrlen1.sh +++ b/tests/test-mbrlen-2.sh @@ -12,4 +12,4 @@ if test $LOCALE_FR = none; then fi LC_ALL=$LOCALE_FR \ -${CHECKER} ./test-mbrlen${EXEEXT} 1 +${CHECKER} ./test-mbrlen${EXEEXT} 2 diff --git a/tests/test-mbrlen2.sh b/tests/test-mbrlen-3.sh similarity index 90% rename from tests/test-mbrlen2.sh rename to tests/test-mbrlen-3.sh index 108394a60e..976803ade1 100755 --- a/tests/test-mbrlen2.sh +++ b/tests/test-mbrlen-3.sh @@ -12,4 +12,4 @@ if test $LOCALE_FR_UTF8 = none; then fi LC_ALL=$LOCALE_FR_UTF8 \ -${CHECKER} ./test-mbrlen${EXEEXT} 2 +${CHECKER} ./test-mbrlen${EXEEXT} 3 diff --git a/tests/test-mbrlen3.sh b/tests/test-mbrlen-4.sh similarity index 90% rename from tests/test-mbrlen3.sh rename to tests/test-mbrlen-4.sh index 57199a0ccc..65ca2ebd2f 100755 --- a/tests/test-mbrlen3.sh +++ b/tests/test-mbrlen-4.sh @@ -12,4 +12,4 @@ if test $LOCALE_JA = none; then fi LC_ALL=$LOCALE_JA \ -${CHECKER} ./test-mbrlen${EXEEXT} 3 +${CHECKER} ./test-mbrlen${EXEEXT} 4 diff --git a/tests/test-mbrlen4.sh b/tests/test-mbrlen-5.sh similarity index 90% rename from tests/test-mbrlen4.sh rename to tests/test-mbrlen-5.sh index 8f83d4d025..d594c66a50 100755 --- a/tests/test-mbrlen4.sh +++ b/tests/test-mbrlen-5.sh @@ -12,4 +12,4 @@ if test $LOCALE_ZH_CN = none; then fi LC_ALL=$LOCALE_ZH_CN \ -${CHECKER} ./test-mbrlen${EXEEXT} 4 +${CHECKER} ./test-mbrlen${EXEEXT} 5 diff --git a/tests/test-mbrlen-w32-1.sh b/tests/test-mbrlen-w32-1.sh deleted file mode 100755 index ccf4c538cb..0000000000 --- a/tests/test-mbrlen-w32-1.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -# Test a CP1252 locale. -${CHECKER} ./test-mbrlen-w32${EXEEXT} French_France 1252 diff --git a/tests/test-mbrlen-w32-2.sh b/tests/test-mbrlen-w32-2.sh index 22c5388d2a..ccf4c538cb 100755 --- a/tests/test-mbrlen-w32-2.sh +++ b/tests/test-mbrlen-w32-2.sh @@ -1,4 +1,4 @@ #!/bin/sh -# Test a CP1256 locale. -${CHECKER} ./test-mbrlen-w32${EXEEXT} "Arabic_Saudi Arabia" 1256 +# Test a CP1252 locale. +${CHECKER} ./test-mbrlen-w32${EXEEXT} French_France 1252 diff --git a/tests/test-mbrlen-w32-3.sh b/tests/test-mbrlen-w32-3.sh index 12c2857b9e..22c5388d2a 100755 --- a/tests/test-mbrlen-w32-3.sh +++ b/tests/test-mbrlen-w32-3.sh @@ -1,4 +1,4 @@ #!/bin/sh -# Test a CP932 locale. -${CHECKER} ./test-mbrlen-w32${EXEEXT} Japanese_Japan 932 +# Test a CP1256 locale. +${CHECKER} ./test-mbrlen-w32${EXEEXT} "Arabic_Saudi Arabia" 1256 diff --git a/tests/test-mbrlen-w32-4.sh b/tests/test-mbrlen-w32-4.sh index 0746b240e7..dbf82d4abd 100755 --- a/tests/test-mbrlen-w32-4.sh +++ b/tests/test-mbrlen-w32-4.sh @@ -1,4 +1,4 @@ #!/bin/sh -# Test a CP950 locale. -${CHECKER} ./test-mbrlen-w32${EXEEXT} Chinese_Taiwan 950 +# Test some UTF-8 locales. +${CHECKER} ./test-mbrlen-w32${EXEEXT} French_France Japanese_Japan Chinese_Taiwan Chinese_China 65001 diff --git a/tests/test-mbrlen-w32-5.sh b/tests/test-mbrlen-w32-5.sh index eb2cec24df..12c2857b9e 100755 --- a/tests/test-mbrlen-w32-5.sh +++ b/tests/test-mbrlen-w32-5.sh @@ -1,4 +1,4 @@ #!/bin/sh -# Test a CP936 locale. -${CHECKER} ./test-mbrlen-w32${EXEEXT} Chinese_China 936 +# Test a CP932 locale. +${CHECKER} ./test-mbrlen-w32${EXEEXT} Japanese_Japan 932 diff --git a/tests/test-mbrlen-w32-6.sh b/tests/test-mbrlen-w32-6.sh index d586b7dd2a..0746b240e7 100755 --- a/tests/test-mbrlen-w32-6.sh +++ b/tests/test-mbrlen-w32-6.sh @@ -1,4 +1,4 @@ #!/bin/sh -# Test a GB18030 locale. -${CHECKER} ./test-mbrlen-w32${EXEEXT} Chinese_China 54936 +# Test a CP950 locale. +${CHECKER} ./test-mbrlen-w32${EXEEXT} Chinese_Taiwan 950 diff --git a/tests/test-mbrlen-w32-7.sh b/tests/test-mbrlen-w32-7.sh index dbf82d4abd..eb2cec24df 100755 --- a/tests/test-mbrlen-w32-7.sh +++ b/tests/test-mbrlen-w32-7.sh @@ -1,4 +1,4 @@ #!/bin/sh -# Test some UTF-8 locales. -${CHECKER} ./test-mbrlen-w32${EXEEXT} French_France Japanese_Japan Chinese_Taiwan Chinese_China 65001 +# Test a CP936 locale. +${CHECKER} ./test-mbrlen-w32${EXEEXT} Chinese_China 936 diff --git a/tests/test-mbrlen-w32-8.sh b/tests/test-mbrlen-w32-8.sh new file mode 100755 index 0000000000..d586b7dd2a --- /dev/null +++ b/tests/test-mbrlen-w32-8.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +# Test a GB18030 locale. +${CHECKER} ./test-mbrlen-w32${EXEEXT} Chinese_China 54936 diff --git a/tests/test-mbrlen-w32.c b/tests/test-mbrlen-w32.c index 2916cf1095..5df7d11df7 100644 --- a/tests/test-mbrlen-w32.c +++ b/tests/test-mbrlen-w32.c @@ -216,6 +216,97 @@ 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[] = "B\303\274\303\237er"; /* "Büßer" */ + memset (&state, '\0', sizeof (mbstate_t)); + + ret = mbrlen (input, 1, &state); + ASSERT (ret == 1); + ASSERT (mbsinit (&state)); + input[0] = '\0'; + + ret = mbrlen (input + 1, 1, &state); + ASSERT (ret == (size_t)(-2)); + ASSERT (!mbsinit (&state)); + input[1] = '\0'; + + ret = mbrlen (input + 2, 5, &state); + ASSERT (ret == 1); + ASSERT (mbsinit (&state)); + input[2] = '\0'; + + ret = mbrlen (input + 3, 4, &state); + ASSERT (ret == 2); + ASSERT (mbsinit (&state)); + input[3] = '\0'; + input[4] = '\0'; + + ret = mbrlen (input + 5, 2, &state); + ASSERT (ret == 1); + ASSERT (mbsinit (&state)); + input[5] = '\0'; + + ret = mbrlen (input + 6, 1, &state); + ASSERT (ret == 1); + ASSERT (mbsinit (&state)); + + /* Test some invalid input. */ + memset (&state, '\0', sizeof (mbstate_t)); + ret = mbrlen ("\377", 1, &state); /* 0xFF */ + ASSERT (ret == (size_t)-1); + ASSERT (errno == EILSEQ); + + memset (&state, '\0', sizeof (mbstate_t)); + ret = mbrlen ("\303\300", 2, &state); /* 0xC3 0xC0 */ + ASSERT (ret == (size_t)-1); + ASSERT (errno == EILSEQ); + + memset (&state, '\0', sizeof (mbstate_t)); + ret = mbrlen ("\343\300", 2, &state); /* 0xE3 0xC0 */ + ASSERT (ret == (size_t)-1); + ASSERT (errno == EILSEQ); + + memset (&state, '\0', sizeof (mbstate_t)); + ret = mbrlen ("\343\300\200", 3, &state); /* 0xE3 0xC0 0x80 */ + ASSERT (ret == (size_t)-1); + ASSERT (errno == EILSEQ); + + memset (&state, '\0', sizeof (mbstate_t)); + ret = mbrlen ("\343\200\300", 3, &state); /* 0xE3 0x80 0xC0 */ + ASSERT (ret == (size_t)-1); + ASSERT (errno == EILSEQ); + + memset (&state, '\0', sizeof (mbstate_t)); + ret = mbrlen ("\363\300", 2, &state); /* 0xF3 0xC0 */ + ASSERT (ret == (size_t)-1); + ASSERT (errno == EILSEQ); + + memset (&state, '\0', sizeof (mbstate_t)); + ret = mbrlen ("\363\300\200\200", 4, &state); /* 0xF3 0xC0 0x80 0x80 */ + ASSERT (ret == (size_t)-1); + ASSERT (errno == EILSEQ); + + memset (&state, '\0', sizeof (mbstate_t)); + ret = mbrlen ("\363\200\300", 3, &state); /* 0xF3 0x80 0xC0 */ + ASSERT (ret == (size_t)-1); + ASSERT (errno == EILSEQ); + + memset (&state, '\0', sizeof (mbstate_t)); + ret = mbrlen ("\363\200\300\200", 4, &state); /* 0xF3 0x80 0xC0 0x80 */ + ASSERT (ret == (size_t)-1); + ASSERT (errno == EILSEQ); + + memset (&state, '\0', sizeof (mbstate_t)); + ret = mbrlen ("\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. */ { @@ -433,97 +524,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[] = "B\303\274\303\237er"; /* "Büßer" */ - memset (&state, '\0', sizeof (mbstate_t)); - - ret = mbrlen (input, 1, &state); - ASSERT (ret == 1); - ASSERT (mbsinit (&state)); - input[0] = '\0'; - - ret = mbrlen (input + 1, 1, &state); - ASSERT (ret == (size_t)(-2)); - ASSERT (!mbsinit (&state)); - input[1] = '\0'; - - ret = mbrlen (input + 2, 5, &state); - ASSERT (ret == 1); - ASSERT (mbsinit (&state)); - input[2] = '\0'; - - ret = mbrlen (input + 3, 4, &state); - ASSERT (ret == 2); - ASSERT (mbsinit (&state)); - input[3] = '\0'; - input[4] = '\0'; - - ret = mbrlen (input + 5, 2, &state); - ASSERT (ret == 1); - ASSERT (mbsinit (&state)); - input[5] = '\0'; - - ret = mbrlen (input + 6, 1, &state); - ASSERT (ret == 1); - ASSERT (mbsinit (&state)); - - /* Test some invalid input. */ - memset (&state, '\0', sizeof (mbstate_t)); - ret = mbrlen ("\377", 1, &state); /* 0xFF */ - ASSERT (ret == (size_t)-1); - ASSERT (errno == EILSEQ); - - memset (&state, '\0', sizeof (mbstate_t)); - ret = mbrlen ("\303\300", 2, &state); /* 0xC3 0xC0 */ - ASSERT (ret == (size_t)-1); - ASSERT (errno == EILSEQ); - - memset (&state, '\0', sizeof (mbstate_t)); - ret = mbrlen ("\343\300", 2, &state); /* 0xE3 0xC0 */ - ASSERT (ret == (size_t)-1); - ASSERT (errno == EILSEQ); - - memset (&state, '\0', sizeof (mbstate_t)); - ret = mbrlen ("\343\300\200", 3, &state); /* 0xE3 0xC0 0x80 */ - ASSERT (ret == (size_t)-1); - ASSERT (errno == EILSEQ); - - memset (&state, '\0', sizeof (mbstate_t)); - ret = mbrlen ("\343\200\300", 3, &state); /* 0xE3 0x80 0xC0 */ - ASSERT (ret == (size_t)-1); - ASSERT (errno == EILSEQ); - - memset (&state, '\0', sizeof (mbstate_t)); - ret = mbrlen ("\363\300", 2, &state); /* 0xF3 0xC0 */ - ASSERT (ret == (size_t)-1); - ASSERT (errno == EILSEQ); - - memset (&state, '\0', sizeof (mbstate_t)); - ret = mbrlen ("\363\300\200\200", 4, &state); /* 0xF3 0xC0 0x80 0x80 */ - ASSERT (ret == (size_t)-1); - ASSERT (errno == EILSEQ); - - memset (&state, '\0', sizeof (mbstate_t)); - ret = mbrlen ("\363\200\300", 3, &state); /* 0xF3 0x80 0xC0 */ - ASSERT (ret == (size_t)-1); - ASSERT (errno == EILSEQ); - - memset (&state, '\0', sizeof (mbstate_t)); - ret = mbrlen ("\363\200\300\200", 4, &state); /* 0xF3 0x80 0xC0 0x80 */ - ASSERT (ret == (size_t)-1); - ASSERT (errno == EILSEQ); - - memset (&state, '\0', sizeof (mbstate_t)); - ret = mbrlen ("\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-mbrlen.c b/tests/test-mbrlen.c index 005d0c801d..65d24dd7c8 100644 --- a/tests/test-mbrlen.c +++ b/tests/test-mbrlen.c @@ -114,14 +114,36 @@ 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; + + ret = mbrlen (buf, 1, &state); + /* POSIX:2018 says: "In the POSIX locale an [EILSEQ] error + cannot occur since all byte values are valid characters." */ + 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" */ @@ -153,7 +175,7 @@ main (int argc, char *argv[]) } return 0; - case '2': + case '3': /* Locale encoding is UTF-8. */ { char input[] = "B\303\274\303\237er"; /* "Büßer" */ @@ -191,7 +213,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>"; /* "<日本語>" */ @@ -230,7 +252,7 @@ main (int argc, char *argv[]) } return 0; - case '4': + case '5': /* Locale encoding is GB18030. */ { char input[] = "B\250\271\201\060\211\070er"; /* "Büßer" */ @@ -269,28 +291,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; - - ret = mbrlen (buf, 1, &state); - /* POSIX:2018 says: "In the POSIX locale an [EILSEQ] error - cannot occur since all byte values are valid characters." */ - ASSERT (ret == 1); - ASSERT (mbsinit (&state)); - } - } - return 0; } return 1; -- 2.39.5