From 4ecb85c8ad45c98a671a5cf639a16fb6f511d978 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 29 Jul 2023 22:13:41 +0200 Subject: [PATCH] c32snrtombs tests: Renumber tests. * tests/test-c32snrtombs-*.sh: Renamed 1 -> 2 -> 3 -> 4 -> 5. * tests/test-c32snrtombs.c: Update. * modules/c32snrtombs-tests: Update. --- ChangeLog | 5 +++++ modules/c32snrtombs-tests | 4 ++-- tests/test-c32snrtombs-1.sh | 15 --------------- tests/test-c32snrtombs-2.sh | 12 ++++++------ tests/test-c32snrtombs-3.sh | 12 ++++++------ tests/test-c32snrtombs-4.sh | 12 ++++++------ tests/test-c32snrtombs-5.sh | 15 +++++++++++++++ tests/test-c32snrtombs.c | 8 ++++---- 8 files changed, 44 insertions(+), 39 deletions(-) delete mode 100755 tests/test-c32snrtombs-1.sh create mode 100755 tests/test-c32snrtombs-5.sh diff --git a/ChangeLog b/ChangeLog index 44c83c2bdb..086a5c24c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2023-07-29 Bruno Haible + c32snrtombs tests: Renumber tests. + * tests/test-c32snrtombs-*.sh: Renamed 1 -> 2 -> 3 -> 4 -> 5. + * tests/test-c32snrtombs.c: Update. + * modules/c32snrtombs-tests: Update. + c32rtomb tests: Renumber tests. * tests/test-c32rtomb.sh: Renamed 1 -> 2 -> 3 -> 4 -> 5 -> 1. * tests/test-c32rtomb.c: Update. diff --git a/modules/c32snrtombs-tests b/modules/c32snrtombs-tests index a201a83a7e..85250e347c 100644 --- a/modules/c32snrtombs-tests +++ b/modules/c32snrtombs-tests @@ -1,8 +1,8 @@ Files: -tests/test-c32snrtombs-1.sh tests/test-c32snrtombs-2.sh tests/test-c32snrtombs-3.sh tests/test-c32snrtombs-4.sh +tests/test-c32snrtombs-5.sh tests/test-c32snrtombs.c tests/signature.h tests/macros.h @@ -22,7 +22,7 @@ gt_LOCALE_JA gt_LOCALE_ZH_CN Makefile.am: -TESTS += test-c32snrtombs-1.sh test-c32snrtombs-2.sh test-c32snrtombs-3.sh test-c32snrtombs-4.sh +TESTS += test-c32snrtombs-2.sh test-c32snrtombs-3.sh test-c32snrtombs-4.sh test-c32snrtombs-5.sh TESTS_ENVIRONMENT += \ LOCALE_FR='@LOCALE_FR@' \ LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \ diff --git a/tests/test-c32snrtombs-1.sh b/tests/test-c32snrtombs-1.sh deleted file mode 100755 index 8a03302337..0000000000 --- a/tests/test-c32snrtombs-1.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/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 - -LC_ALL=$LOCALE_FR \ -${CHECKER} ./test-c32snrtombs${EXEEXT} 1 diff --git a/tests/test-c32snrtombs-2.sh b/tests/test-c32snrtombs-2.sh index 97840cf983..ba3a892ff4 100755 --- a/tests/test-c32snrtombs-2.sh +++ b/tests/test-c32snrtombs-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-c32snrtombs${EXEEXT} 2 diff --git a/tests/test-c32snrtombs-3.sh b/tests/test-c32snrtombs-3.sh index 44c9b91859..2a7195e4bf 100755 --- a/tests/test-c32snrtombs-3.sh +++ b/tests/test-c32snrtombs-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-c32snrtombs${EXEEXT} 3 diff --git a/tests/test-c32snrtombs-4.sh b/tests/test-c32snrtombs-4.sh index 6de78a284b..c93ad36e90 100755 --- a/tests/test-c32snrtombs-4.sh +++ b/tests/test-c32snrtombs-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-c32snrtombs${EXEEXT} 4 diff --git a/tests/test-c32snrtombs-5.sh b/tests/test-c32snrtombs-5.sh new file mode 100755 index 0000000000..94c1b2dd83 --- /dev/null +++ b/tests/test-c32snrtombs-5.sh @@ -0,0 +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 + 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 + +LC_ALL=$LOCALE_ZH_CN \ +${CHECKER} ./test-c32snrtombs${EXEEXT} 5 diff --git a/tests/test-c32snrtombs.c b/tests/test-c32snrtombs.c index ef09679524..9f2c88b307 100644 --- a/tests/test-c32snrtombs.c +++ b/tests/test-c32snrtombs.c @@ -54,7 +54,7 @@ main (int argc, char *argv[]) switch (argv[1][0]) { - case '1': + case '2': /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ { const char original[] = "B\374\337er"; /* "Büßer" */ @@ -83,7 +83,7 @@ main (int argc, char *argv[]) } break; - case '2': + case '3': /* Locale encoding is UTF-8. */ { const char original[] = "s\303\274\303\237\360\237\230\213!"; /* "süß😋!" */ @@ -120,7 +120,7 @@ main (int argc, char *argv[]) } break; - case '3': + case '4': /* Locale encoding is EUC-JP. */ { const char original[] = "<\306\374\313\334\270\354>"; /* "<日本語>" */ @@ -158,7 +158,7 @@ main (int argc, char *argv[]) break; - 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); -- 2.39.5