From: Bruno Haible Date: Sat, 29 Jul 2023 21:04:32 +0000 (+0200) Subject: mbmemcasecoll tests: Renumber tests. X-Git-Tag: v1.0~1005 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=646c92882714cc182c06eeb16375b1d5fbd45095;p=gnulib.git mbmemcasecoll tests: Renumber tests. * tests/test-mbmemcasecoll*.sh: Renamed 1 -> 2 -> 3 -> 4. * tests/test-mbmemcasecoll.c: Update. * modules/mbmemcasecoll-tests: Update. --- 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-mbmemcasecoll-2.sh b/tests/test-mbmemcasecoll-2.sh new file mode 100755 index 0000000000..12f0d663c5 --- /dev/null +++ b/tests/test-mbmemcasecoll-2.sh @@ -0,0 +1,15 @@ +#!/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-mbmemcasecoll${EXEEXT} 2 diff --git a/tests/test-mbmemcasecoll-3.sh b/tests/test-mbmemcasecoll-3.sh new file mode 100755 index 0000000000..ec64dab190 --- /dev/null +++ b/tests/test-mbmemcasecoll-3.sh @@ -0,0 +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 + if test -f /usr/bin/localedef; then + echo "Skipping test: no french Unicode locale is installed" + else + echo "Skipping test: no french Unicode locale is supported" + fi + exit 77 +fi + +LC_ALL=$LOCALE_FR_UTF8 \ +${CHECKER} ./test-mbmemcasecoll${EXEEXT} 3 diff --git a/tests/test-mbmemcasecoll-4.sh b/tests/test-mbmemcasecoll-4.sh new file mode 100755 index 0000000000..2c97233222 --- /dev/null +++ b/tests/test-mbmemcasecoll-4.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +# Test whether a specific Turkish locale is installed. +: "${LOCALE_TR_UTF8=tr_TR.UTF-8}" +if test $LOCALE_TR_UTF8 = none; then + if test -f /usr/bin/localedef; then + echo "Skipping test: no turkish Unicode locale is installed" + else + echo "Skipping test: no turkish Unicode locale is supported" + fi + exit 77 +fi + +LC_ALL=$LOCALE_TR_UTF8 \ +${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; diff --git a/tests/test-mbmemcasecoll1.sh b/tests/test-mbmemcasecoll1.sh deleted file mode 100755 index 073eab90c8..0000000000 --- a/tests/test-mbmemcasecoll1.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-mbmemcasecoll${EXEEXT} 1 diff --git a/tests/test-mbmemcasecoll2.sh b/tests/test-mbmemcasecoll2.sh deleted file mode 100755 index 995f3f72a8..0000000000 --- a/tests/test-mbmemcasecoll2.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/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 - if test -f /usr/bin/localedef; then - echo "Skipping test: no french Unicode locale is installed" - else - echo "Skipping test: no french Unicode locale is supported" - fi - exit 77 -fi - -LC_ALL=$LOCALE_FR_UTF8 \ -${CHECKER} ./test-mbmemcasecoll${EXEEXT} 2 diff --git a/tests/test-mbmemcasecoll3.sh b/tests/test-mbmemcasecoll3.sh deleted file mode 100755 index f4f2995e54..0000000000 --- a/tests/test-mbmemcasecoll3.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -# Test whether a specific Turkish locale is installed. -: "${LOCALE_TR_UTF8=tr_TR.UTF-8}" -if test $LOCALE_TR_UTF8 = none; then - if test -f /usr/bin/localedef; then - echo "Skipping test: no turkish Unicode locale is installed" - else - echo "Skipping test: no turkish Unicode locale is supported" - fi - exit 77 -fi - -LC_ALL=$LOCALE_TR_UTF8 \ -${CHECKER} ./test-mbmemcasecoll${EXEEXT} 3