From c67e12ab8cbd5d64545b11ca532dfbc40e8230da Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 29 Jul 2023 23:02:01 +0200 Subject: [PATCH] mbmemcasecmp tests: Renumber tests. * tests/test-mbmemcasecmp*.sh: Renamed 1 -> 2 -> 3 -> 4. * tests/test-mbmemcasecmp.c: Update. * modules/mbmemcasecmp-tests: Update. --- ChangeLog | 5 +++++ modules/mbmemcasecmp-tests | 8 ++++---- tests/{test-mbmemcasecmp1.sh => test-mbmemcasecmp-2.sh} | 2 +- tests/{test-mbmemcasecmp2.sh => test-mbmemcasecmp-3.sh} | 2 +- tests/{test-mbmemcasecmp3.sh => test-mbmemcasecmp-4.sh} | 2 +- tests/test-mbmemcasecmp.c | 6 +++--- 6 files changed, 15 insertions(+), 10 deletions(-) rename tests/{test-mbmemcasecmp1.sh => test-mbmemcasecmp-2.sh} (88%) rename tests/{test-mbmemcasecmp2.sh => test-mbmemcasecmp-3.sh} (89%) rename tests/{test-mbmemcasecmp3.sh => test-mbmemcasecmp-4.sh} (89%) diff --git a/ChangeLog b/ChangeLog index 29b298d931..a892d6a7a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2023-07-29 Bruno Haible + mbmemcasecmp tests: Renumber tests. + * tests/test-mbmemcasecmp*.sh: Renamed 1 -> 2 -> 3 -> 4. + * tests/test-mbmemcasecmp.c: Update. + * modules/mbmemcasecmp-tests: Update. + fnmatch tests: Renumber tests. * tests/test-fnmatch-w32-*.sh: Renamed 1 -> 2 -> 3 -> 5 -> 7 -> 4 -> 6 -> 8. diff --git a/modules/mbmemcasecmp-tests b/modules/mbmemcasecmp-tests index 52cb80def7..06b20be337 100644 --- a/modules/mbmemcasecmp-tests +++ b/modules/mbmemcasecmp-tests @@ -1,7 +1,7 @@ Files: -tests/test-mbmemcasecmp1.sh -tests/test-mbmemcasecmp2.sh -tests/test-mbmemcasecmp3.sh +tests/test-mbmemcasecmp-2.sh +tests/test-mbmemcasecmp-3.sh +tests/test-mbmemcasecmp-4.sh tests/test-mbmemcasecmp.c tests/test-mbmemcasecmp.h tests/macros.h @@ -21,7 +21,7 @@ gt_LOCALE_FR_UTF8 gt_LOCALE_TR_UTF8 Makefile.am: -TESTS += test-mbmemcasecmp1.sh test-mbmemcasecmp2.sh test-mbmemcasecmp3.sh +TESTS += test-mbmemcasecmp-2.sh test-mbmemcasecmp-3.sh test-mbmemcasecmp-4.sh TESTS_ENVIRONMENT += \ LOCALE_FR='@LOCALE_FR@' \ LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \ diff --git a/tests/test-mbmemcasecmp1.sh b/tests/test-mbmemcasecmp-2.sh similarity index 88% rename from tests/test-mbmemcasecmp1.sh rename to tests/test-mbmemcasecmp-2.sh index af9ff764ee..c3f3c7fc5d 100755 --- a/tests/test-mbmemcasecmp1.sh +++ b/tests/test-mbmemcasecmp-2.sh @@ -12,4 +12,4 @@ if test $LOCALE_FR = none; then fi LC_ALL=$LOCALE_FR \ -${CHECKER} ./test-mbmemcasecmp${EXEEXT} 1 +${CHECKER} ./test-mbmemcasecmp${EXEEXT} 2 diff --git a/tests/test-mbmemcasecmp2.sh b/tests/test-mbmemcasecmp-3.sh similarity index 89% rename from tests/test-mbmemcasecmp2.sh rename to tests/test-mbmemcasecmp-3.sh index 61d321443f..ada26e0aa0 100755 --- a/tests/test-mbmemcasecmp2.sh +++ b/tests/test-mbmemcasecmp-3.sh @@ -12,4 +12,4 @@ if test $LOCALE_FR_UTF8 = none; then fi LC_ALL=$LOCALE_FR_UTF8 \ -${CHECKER} ./test-mbmemcasecmp${EXEEXT} 2 +${CHECKER} ./test-mbmemcasecmp${EXEEXT} 3 diff --git a/tests/test-mbmemcasecmp3.sh b/tests/test-mbmemcasecmp-4.sh similarity index 89% rename from tests/test-mbmemcasecmp3.sh rename to tests/test-mbmemcasecmp-4.sh index b847774821..eb1747eb05 100755 --- a/tests/test-mbmemcasecmp3.sh +++ b/tests/test-mbmemcasecmp-4.sh @@ -12,4 +12,4 @@ if test $LOCALE_TR_UTF8 = none; then fi LC_ALL=$LOCALE_TR_UTF8 \ -${CHECKER} ./test-mbmemcasecmp${EXEEXT} 3 +${CHECKER} ./test-mbmemcasecmp${EXEEXT} 4 diff --git a/tests/test-mbmemcasecmp.c b/tests/test-mbmemcasecmp.c index f8ae91e401..1e867924d4 100644 --- a/tests/test-mbmemcasecmp.c +++ b/tests/test-mbmemcasecmp.c @@ -41,17 +41,17 @@ main (int argc, char *argv[]) if (argc > 1) switch (argv[1][0]) { - case '1': + case '2': /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ test_iso_8859_1 (mbmemcasecmp, true); return 0; - case '2': + case '3': /* Locale encoding is UTF-8, locale is not Turkish. */ test_utf_8 (mbmemcasecmp, false); return 0; - case '3': + case '4': /* Locale encoding is UTF-8, locale is Turkish. */ test_utf_8 (mbmemcasecmp, true); return 0; -- 2.39.5