From 81fc28cd958eaf6452867bad4125be77102ed880 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 30 Jul 2023 00:52:24 +0200 Subject: [PATCH] wcsnrtombs tests: Renumber tests. * tests/test-wcsnrtombs*.sh: Renamed 1 -> 2 -> 3 -> 4 -> 5. * tests/test-wcsnrtombs.c: Update. * modules/wcsnrtombs-tests: Update. --- ChangeLog | 5 +++++ modules/wcsnrtombs-tests | 12 +++++++----- tests/{test-wcsnrtombs1.sh => test-wcsnrtombs-2.sh} | 2 +- tests/{test-wcsnrtombs2.sh => test-wcsnrtombs-3.sh} | 2 +- tests/{test-wcsnrtombs3.sh => test-wcsnrtombs-4.sh} | 2 +- tests/{test-wcsnrtombs4.sh => test-wcsnrtombs-5.sh} | 2 +- tests/test-wcsnrtombs.c | 8 ++++---- 7 files changed, 20 insertions(+), 13 deletions(-) rename tests/{test-wcsnrtombs1.sh => test-wcsnrtombs-2.sh} (89%) rename tests/{test-wcsnrtombs2.sh => test-wcsnrtombs-3.sh} (89%) rename tests/{test-wcsnrtombs3.sh => test-wcsnrtombs-4.sh} (89%) rename tests/{test-wcsnrtombs4.sh => test-wcsnrtombs-5.sh} (90%) diff --git a/ChangeLog b/ChangeLog index 4a26a99194..20c46a6d18 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2023-07-29 Bruno Haible + wcsnrtombs tests: Renumber tests. + * tests/test-wcsnrtombs*.sh: Renamed 1 -> 2 -> 3 -> 4 -> 5. + * tests/test-wcsnrtombs.c: Update. + * modules/wcsnrtombs-tests: Update. + wcrtomb tests: Renumber tests. * tests/test-wcrtomb.sh: Renamed 1 -> 2 -> 3 -> 4 -> 5 -> 1. * tests/test-wcrtomb.c: Update. diff --git a/modules/wcsnrtombs-tests b/modules/wcsnrtombs-tests index 6ddd43a27e..04ec77eff6 100644 --- a/modules/wcsnrtombs-tests +++ b/modules/wcsnrtombs-tests @@ -1,8 +1,8 @@ Files: -tests/test-wcsnrtombs1.sh -tests/test-wcsnrtombs2.sh -tests/test-wcsnrtombs3.sh -tests/test-wcsnrtombs4.sh +tests/test-wcsnrtombs-2.sh +tests/test-wcsnrtombs-3.sh +tests/test-wcsnrtombs-4.sh +tests/test-wcsnrtombs-5.sh tests/test-wcsnrtombs.c tests/signature.h tests/macros.h @@ -21,7 +21,9 @@ gt_LOCALE_JA gt_LOCALE_ZH_CN Makefile.am: -TESTS += test-wcsnrtombs1.sh test-wcsnrtombs2.sh test-wcsnrtombs3.sh test-wcsnrtombs4.sh +TESTS += \ + test-wcsnrtombs-2.sh test-wcsnrtombs-3.sh test-wcsnrtombs-4.sh \ + test-wcsnrtombs-5.sh TESTS_ENVIRONMENT += \ LOCALE_FR='@LOCALE_FR@' \ LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \ diff --git a/tests/test-wcsnrtombs1.sh b/tests/test-wcsnrtombs-2.sh similarity index 89% rename from tests/test-wcsnrtombs1.sh rename to tests/test-wcsnrtombs-2.sh index 0468a68221..ec4e27d86d 100755 --- a/tests/test-wcsnrtombs1.sh +++ b/tests/test-wcsnrtombs-2.sh @@ -12,4 +12,4 @@ if test $LOCALE_FR = none; then fi LC_ALL=$LOCALE_FR \ -${CHECKER} ./test-wcsnrtombs${EXEEXT} 1 +${CHECKER} ./test-wcsnrtombs${EXEEXT} 2 diff --git a/tests/test-wcsnrtombs2.sh b/tests/test-wcsnrtombs-3.sh similarity index 89% rename from tests/test-wcsnrtombs2.sh rename to tests/test-wcsnrtombs-3.sh index 2066794398..414a43ec89 100755 --- a/tests/test-wcsnrtombs2.sh +++ b/tests/test-wcsnrtombs-3.sh @@ -12,4 +12,4 @@ if test $LOCALE_FR_UTF8 = none; then fi LC_ALL=$LOCALE_FR_UTF8 \ -${CHECKER} ./test-wcsnrtombs${EXEEXT} 2 +${CHECKER} ./test-wcsnrtombs${EXEEXT} 3 diff --git a/tests/test-wcsnrtombs3.sh b/tests/test-wcsnrtombs-4.sh similarity index 89% rename from tests/test-wcsnrtombs3.sh rename to tests/test-wcsnrtombs-4.sh index 1b67da7fb5..a0277b4cee 100755 --- a/tests/test-wcsnrtombs3.sh +++ b/tests/test-wcsnrtombs-4.sh @@ -12,4 +12,4 @@ if test $LOCALE_JA = none; then fi LC_ALL=$LOCALE_JA \ -${CHECKER} ./test-wcsnrtombs${EXEEXT} 3 +${CHECKER} ./test-wcsnrtombs${EXEEXT} 4 diff --git a/tests/test-wcsnrtombs4.sh b/tests/test-wcsnrtombs-5.sh similarity index 90% rename from tests/test-wcsnrtombs4.sh rename to tests/test-wcsnrtombs-5.sh index c7759505ac..da76f687a7 100755 --- a/tests/test-wcsnrtombs4.sh +++ b/tests/test-wcsnrtombs-5.sh @@ -12,4 +12,4 @@ if test $LOCALE_ZH_CN = none; then fi LC_ALL=$LOCALE_ZH_CN \ -${CHECKER} ./test-wcsnrtombs${EXEEXT} 4 +${CHECKER} ./test-wcsnrtombs${EXEEXT} 5 diff --git a/tests/test-wcsnrtombs.c b/tests/test-wcsnrtombs.c index 440d7c5edd..d9d9178c33 100644 --- a/tests/test-wcsnrtombs.c +++ b/tests/test-wcsnrtombs.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[] = "B\303\274\303\237er"; /* "Büßer" */ @@ -118,7 +118,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>"; /* "<日本語>" */ @@ -156,7 +156,7 @@ main (int argc, char *argv[]) break; - case '4': + case '5': /* Locale encoding is GB18030. */ { const char original[] = "B\250\271\201\060\211\070er"; /* "Büßer" */ -- 2.39.5