From 646c92882714cc182c06eeb16375b1d5fbd45095 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 29 Jul 2023 23:04:32 +0200 Subject: [PATCH] mbmemcasecoll tests: Renumber tests. * tests/test-mbmemcasecoll*.sh: Renamed 1 -> 2 -> 3 -> 4. * tests/test-mbmemcasecoll.c: Update. * modules/mbmemcasecoll-tests: Update. --- ChangeLog | 5 +++++ modules/mbmemcasecoll-tests | 8 ++++---- tests/{test-mbmemcasecoll1.sh => test-mbmemcasecoll-2.sh} | 2 +- tests/{test-mbmemcasecoll2.sh => test-mbmemcasecoll-3.sh} | 2 +- tests/{test-mbmemcasecoll3.sh => test-mbmemcasecoll-4.sh} | 2 +- tests/test-mbmemcasecoll.c | 6 +++--- 6 files changed, 15 insertions(+), 10 deletions(-) rename tests/{test-mbmemcasecoll1.sh => test-mbmemcasecoll-2.sh} (88%) rename tests/{test-mbmemcasecoll2.sh => test-mbmemcasecoll-3.sh} (89%) rename tests/{test-mbmemcasecoll3.sh => test-mbmemcasecoll-4.sh} (89%) diff --git a/ChangeLog b/ChangeLog index a892d6a7a9..18deab3fa0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2023-07-29 Bruno Haible + mbmemcasecoll tests: Renumber tests. + * tests/test-mbmemcasecoll*.sh: Renamed 1 -> 2 -> 3 -> 4. + * tests/test-mbmemcasecoll.c: Update. + * modules/mbmemcasecoll-tests: Update. + mbmemcasecmp tests: Renumber tests. * tests/test-mbmemcasecmp*.sh: Renamed 1 -> 2 -> 3 -> 4. * tests/test-mbmemcasecmp.c: Update. diff --git a/modules/mbmemcasecoll-tests b/modules/mbmemcasecoll-tests index 8cba105846..7486cbf333 100644 --- a/modules/mbmemcasecoll-tests +++ b/modules/mbmemcasecoll-tests @@ -1,7 +1,7 @@ Files: -tests/test-mbmemcasecoll1.sh -tests/test-mbmemcasecoll2.sh -tests/test-mbmemcasecoll3.sh +tests/test-mbmemcasecoll-2.sh +tests/test-mbmemcasecoll-3.sh +tests/test-mbmemcasecoll-4.sh tests/test-mbmemcasecoll.c tests/test-mbmemcasecmp.h tests/macros.h @@ -21,7 +21,7 @@ gt_LOCALE_FR_UTF8 gt_LOCALE_TR_UTF8 Makefile.am: -TESTS += test-mbmemcasecoll1.sh test-mbmemcasecoll2.sh test-mbmemcasecoll3.sh +TESTS += test-mbmemcasecoll-2.sh test-mbmemcasecoll-3.sh test-mbmemcasecoll-4.sh TESTS_ENVIRONMENT += \ LOCALE_FR='@LOCALE_FR@' \ LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \ diff --git a/tests/test-mbmemcasecoll1.sh b/tests/test-mbmemcasecoll-2.sh similarity index 88% rename from tests/test-mbmemcasecoll1.sh rename to tests/test-mbmemcasecoll-2.sh index 073eab90c8..12f0d663c5 100755 --- a/tests/test-mbmemcasecoll1.sh +++ b/tests/test-mbmemcasecoll-2.sh @@ -12,4 +12,4 @@ if test $LOCALE_FR = none; then fi LC_ALL=$LOCALE_FR \ -${CHECKER} ./test-mbmemcasecoll${EXEEXT} 1 +${CHECKER} ./test-mbmemcasecoll${EXEEXT} 2 diff --git a/tests/test-mbmemcasecoll2.sh b/tests/test-mbmemcasecoll-3.sh similarity index 89% rename from tests/test-mbmemcasecoll2.sh rename to tests/test-mbmemcasecoll-3.sh index 995f3f72a8..ec64dab190 100755 --- a/tests/test-mbmemcasecoll2.sh +++ b/tests/test-mbmemcasecoll-3.sh @@ -12,4 +12,4 @@ if test $LOCALE_FR_UTF8 = none; then fi LC_ALL=$LOCALE_FR_UTF8 \ -${CHECKER} ./test-mbmemcasecoll${EXEEXT} 2 +${CHECKER} ./test-mbmemcasecoll${EXEEXT} 3 diff --git a/tests/test-mbmemcasecoll3.sh b/tests/test-mbmemcasecoll-4.sh similarity index 89% rename from tests/test-mbmemcasecoll3.sh rename to tests/test-mbmemcasecoll-4.sh index f4f2995e54..2c97233222 100755 --- a/tests/test-mbmemcasecoll3.sh +++ b/tests/test-mbmemcasecoll-4.sh @@ -12,4 +12,4 @@ if test $LOCALE_TR_UTF8 = none; then fi LC_ALL=$LOCALE_TR_UTF8 \ -${CHECKER} ./test-mbmemcasecoll${EXEEXT} 3 +${CHECKER} ./test-mbmemcasecoll${EXEEXT} 4 diff --git a/tests/test-mbmemcasecoll.c b/tests/test-mbmemcasecoll.c index ebcc0618c4..b066fabf17 100644 --- a/tests/test-mbmemcasecoll.c +++ b/tests/test-mbmemcasecoll.c @@ -47,17 +47,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 (mbmemcasecoll_hard, false); return 0; - case '2': + case '3': /* Locale encoding is UTF-8, locale is not Turkish. */ test_utf_8 (mbmemcasecoll_hard, false); return 0; - case '3': + case '4': /* Locale encoding is UTF-8, locale is Turkish. */ test_utf_8 (mbmemcasecoll_hard, true); return 0; -- 2.39.5