From: Bruno Haible Date: Wed, 8 Feb 2023 22:38:08 +0000 (+0100) Subject: nl_langinfo tests: Prepare for adding more tests. X-Git-Tag: v1.0~1696 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=57ec1201e41544144928901fa21f93085c9862d0;p=gnulib.git nl_langinfo tests: Prepare for adding more tests. * tests/test-nl_langinfo1.c: Renamed from tests/test-nl_langinfo.c. * tests/test-nl_langinfo1.sh: Renamed from tests/test-nl_langinfo.sh. Update. * modules/nl_langinfo-tests (Files, Makefile.am): Update. --- diff --git a/ChangeLog b/ChangeLog index 3d093609dc..fcced364ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2023-02-08 Bruno Haible + + nl_langinfo tests: Prepare for adding more tests. + * tests/test-nl_langinfo1.c: Renamed from tests/test-nl_langinfo.c. + * tests/test-nl_langinfo1.sh: Renamed from tests/test-nl_langinfo.sh. + Update. + * modules/nl_langinfo-tests (Files, Makefile.am): Update. + 2023-02-08 Bruno Haible assert-h: Fix test failure on IRIX 6.5. diff --git a/modules/nl_langinfo-tests b/modules/nl_langinfo-tests index c6770ec321..e4456e3789 100644 --- a/modules/nl_langinfo-tests +++ b/modules/nl_langinfo-tests @@ -1,6 +1,6 @@ Files: -tests/test-nl_langinfo.sh -tests/test-nl_langinfo.c +tests/test-nl_langinfo1.sh +tests/test-nl_langinfo1.c tests/test-nl_langinfo-mt.c tests/signature.h tests/macros.h @@ -17,8 +17,8 @@ gt_LOCALE_FR gt_LOCALE_FR_UTF8 Makefile.am: -TESTS += test-nl_langinfo.sh test-nl_langinfo-mt +TESTS += test-nl_langinfo1.sh test-nl_langinfo-mt TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' -check_PROGRAMS += test-nl_langinfo test-nl_langinfo-mt -test_nl_langinfo_LDADD = $(LDADD) $(SETLOCALE_LIB) +check_PROGRAMS += test-nl_langinfo1 test-nl_langinfo-mt +test_nl_langinfo1_LDADD = $(LDADD) $(SETLOCALE_LIB) test_nl_langinfo_mt_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBMULTITHREAD) $(NANOSLEEP_LIB) diff --git a/tests/test-nl_langinfo.c b/tests/test-nl_langinfo.c deleted file mode 100644 index 5254f8626e..0000000000 --- a/tests/test-nl_langinfo.c +++ /dev/null @@ -1,152 +0,0 @@ -/* Test of nl_langinfo replacement. - Copyright (C) 2009-2023 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ - -/* Written by Bruno Haible , 2009. */ - -#include - -#include - -#include "signature.h" -SIGNATURE_CHECK (nl_langinfo, char *, (nl_item)); - -#include -#include -#include - -#include "c-strcase.h" -#include "macros.h" - -/* For GCC >= 4.3, silence the warnings - "comparison of unsigned expression >= 0 is always true" - in this file. */ -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) -# pragma GCC diagnostic ignored "-Wtype-limits" -#endif - -int -main (int argc, char *argv[]) -{ - int pass = atoi (argv[1]); - /* pass locale - 0 C - 1 traditional French locale - 2 French UTF-8 locale - */ - - setlocale (LC_ALL, ""); - - /* nl_langinfo items of the LC_CTYPE category */ - ASSERT (strlen (nl_langinfo (CODESET)) > 0); - if (pass == 2) - { - const char *codeset = nl_langinfo (CODESET); - ASSERT (c_strcasecmp (codeset, "UTF-8") == 0 || c_strcasecmp (codeset, "UTF8") == 0); - } - /* nl_langinfo items of the LC_NUMERIC category */ - ASSERT (strlen (nl_langinfo (RADIXCHAR)) > 0); - ASSERT (strlen (nl_langinfo (THOUSEP)) >= 0); - /* nl_langinfo items of the LC_TIME category */ - ASSERT (strlen (nl_langinfo (D_T_FMT)) > 0); - ASSERT (strlen (nl_langinfo (D_FMT)) > 0); - ASSERT (strlen (nl_langinfo (T_FMT)) > 0); - ASSERT (strlen (nl_langinfo (T_FMT_AMPM)) >= (pass == 0 ? 1 : 0)); - ASSERT (strlen (nl_langinfo (AM_STR)) >= (pass == 0 ? 1 : 0)); - ASSERT (strlen (nl_langinfo (PM_STR)) >= (pass == 0 ? 1 : 0)); - ASSERT (strlen (nl_langinfo (DAY_1)) > 0); - ASSERT (strlen (nl_langinfo (DAY_2)) > 0); - ASSERT (strlen (nl_langinfo (DAY_3)) > 0); - ASSERT (strlen (nl_langinfo (DAY_4)) > 0); - ASSERT (strlen (nl_langinfo (DAY_5)) > 0); - ASSERT (strlen (nl_langinfo (DAY_6)) > 0); - ASSERT (strlen (nl_langinfo (DAY_7)) > 0); - ASSERT (strlen (nl_langinfo (ABDAY_1)) > 0); - ASSERT (strlen (nl_langinfo (ABDAY_2)) > 0); - ASSERT (strlen (nl_langinfo (ABDAY_3)) > 0); - ASSERT (strlen (nl_langinfo (ABDAY_4)) > 0); - ASSERT (strlen (nl_langinfo (ABDAY_5)) > 0); - ASSERT (strlen (nl_langinfo (ABDAY_6)) > 0); - ASSERT (strlen (nl_langinfo (ABDAY_7)) > 0); - ASSERT (strlen (nl_langinfo (MON_1)) > 0); - ASSERT (strlen (nl_langinfo (MON_2)) > 0); - ASSERT (strlen (nl_langinfo (MON_3)) > 0); - ASSERT (strlen (nl_langinfo (MON_4)) > 0); - ASSERT (strlen (nl_langinfo (MON_5)) > 0); - ASSERT (strlen (nl_langinfo (MON_6)) > 0); - ASSERT (strlen (nl_langinfo (MON_7)) > 0); - ASSERT (strlen (nl_langinfo (MON_8)) > 0); - ASSERT (strlen (nl_langinfo (MON_9)) > 0); - ASSERT (strlen (nl_langinfo (MON_10)) > 0); - ASSERT (strlen (nl_langinfo (MON_11)) > 0); - ASSERT (strlen (nl_langinfo (MON_12)) > 0); - ASSERT (strlen (nl_langinfo (ALTMON_1)) > 0); - ASSERT (strlen (nl_langinfo (ALTMON_2)) > 0); - ASSERT (strlen (nl_langinfo (ALTMON_3)) > 0); - ASSERT (strlen (nl_langinfo (ALTMON_4)) > 0); - ASSERT (strlen (nl_langinfo (ALTMON_5)) > 0); - ASSERT (strlen (nl_langinfo (ALTMON_6)) > 0); - ASSERT (strlen (nl_langinfo (ALTMON_7)) > 0); - ASSERT (strlen (nl_langinfo (ALTMON_8)) > 0); - ASSERT (strlen (nl_langinfo (ALTMON_9)) > 0); - ASSERT (strlen (nl_langinfo (ALTMON_10)) > 0); - ASSERT (strlen (nl_langinfo (ALTMON_11)) > 0); - ASSERT (strlen (nl_langinfo (ALTMON_12)) > 0); - /* In the tested locales, alternate month names and month names ought to be - the same. */ - ASSERT (strcmp (nl_langinfo (ALTMON_1), nl_langinfo (MON_1)) == 0); - ASSERT (strcmp (nl_langinfo (ALTMON_2), nl_langinfo (MON_2)) == 0); - ASSERT (strcmp (nl_langinfo (ALTMON_3), nl_langinfo (MON_3)) == 0); - ASSERT (strcmp (nl_langinfo (ALTMON_4), nl_langinfo (MON_4)) == 0); - ASSERT (strcmp (nl_langinfo (ALTMON_5), nl_langinfo (MON_5)) == 0); - ASSERT (strcmp (nl_langinfo (ALTMON_6), nl_langinfo (MON_6)) == 0); - ASSERT (strcmp (nl_langinfo (ALTMON_7), nl_langinfo (MON_7)) == 0); - ASSERT (strcmp (nl_langinfo (ALTMON_8), nl_langinfo (MON_8)) == 0); - ASSERT (strcmp (nl_langinfo (ALTMON_9), nl_langinfo (MON_9)) == 0); - ASSERT (strcmp (nl_langinfo (ALTMON_10), nl_langinfo (MON_10)) == 0); - ASSERT (strcmp (nl_langinfo (ALTMON_11), nl_langinfo (MON_11)) == 0); - ASSERT (strcmp (nl_langinfo (ALTMON_12), nl_langinfo (MON_12)) == 0); - ASSERT (strlen (nl_langinfo (ABMON_1)) > 0); - ASSERT (strlen (nl_langinfo (ABMON_2)) > 0); - ASSERT (strlen (nl_langinfo (ABMON_3)) > 0); - ASSERT (strlen (nl_langinfo (ABMON_4)) > 0); - ASSERT (strlen (nl_langinfo (ABMON_5)) > 0); - ASSERT (strlen (nl_langinfo (ABMON_6)) > 0); - ASSERT (strlen (nl_langinfo (ABMON_7)) > 0); - ASSERT (strlen (nl_langinfo (ABMON_8)) > 0); - ASSERT (strlen (nl_langinfo (ABMON_9)) > 0); - ASSERT (strlen (nl_langinfo (ABMON_10)) > 0); - ASSERT (strlen (nl_langinfo (ABMON_11)) > 0); - ASSERT (strlen (nl_langinfo (ABMON_12)) > 0); - ASSERT (strlen (nl_langinfo (ERA)) >= 0); - ASSERT (strlen (nl_langinfo (ERA_D_FMT)) >= 0); - ASSERT (strlen (nl_langinfo (ERA_D_T_FMT)) >= 0); - ASSERT (strlen (nl_langinfo (ERA_T_FMT)) >= 0); - ASSERT (nl_langinfo (ALT_DIGITS) != NULL); - /* nl_langinfo items of the LC_MONETARY category */ - { - const char *currency = nl_langinfo (CRNCYSTR); - ASSERT (strlen (currency) >= 0); -#if !defined __NetBSD__ - if (pass > 0) - ASSERT (strlen (currency) >= 1); -#endif - } - /* nl_langinfo items of the LC_MESSAGES category */ - ASSERT (strlen (nl_langinfo (YESEXPR)) > 0); - ASSERT (strlen (nl_langinfo (NOEXPR)) > 0); - - return 0; -} diff --git a/tests/test-nl_langinfo.sh b/tests/test-nl_langinfo.sh deleted file mode 100755 index a66672fe2c..0000000000 --- a/tests/test-nl_langinfo.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -LC_ALL=C ${CHECKER} ./test-nl_langinfo${EXEEXT} 0 || exit 1 - -# Test whether a specific traditional locale is installed. -: "${LOCALE_FR=fr_FR}" -if test $LOCALE_FR != none; then - LC_ALL=$LOCALE_FR ${CHECKER} ./test-nl_langinfo${EXEEXT} 1 || exit 1 -fi - -# Test whether a specific UTF-8 locale is installed. -: "${LOCALE_FR_UTF8=fr_FR.UTF-8}" -if test $LOCALE_FR_UTF8 != none; then - LC_ALL=$LOCALE_FR_UTF8 ${CHECKER} ./test-nl_langinfo${EXEEXT} 2 || exit 1 -fi - -exit 0 diff --git a/tests/test-nl_langinfo1.c b/tests/test-nl_langinfo1.c new file mode 100644 index 0000000000..5254f8626e --- /dev/null +++ b/tests/test-nl_langinfo1.c @@ -0,0 +1,152 @@ +/* Test of nl_langinfo replacement. + Copyright (C) 2009-2023 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +/* Written by Bruno Haible , 2009. */ + +#include + +#include + +#include "signature.h" +SIGNATURE_CHECK (nl_langinfo, char *, (nl_item)); + +#include +#include +#include + +#include "c-strcase.h" +#include "macros.h" + +/* For GCC >= 4.3, silence the warnings + "comparison of unsigned expression >= 0 is always true" + in this file. */ +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) +# pragma GCC diagnostic ignored "-Wtype-limits" +#endif + +int +main (int argc, char *argv[]) +{ + int pass = atoi (argv[1]); + /* pass locale + 0 C + 1 traditional French locale + 2 French UTF-8 locale + */ + + setlocale (LC_ALL, ""); + + /* nl_langinfo items of the LC_CTYPE category */ + ASSERT (strlen (nl_langinfo (CODESET)) > 0); + if (pass == 2) + { + const char *codeset = nl_langinfo (CODESET); + ASSERT (c_strcasecmp (codeset, "UTF-8") == 0 || c_strcasecmp (codeset, "UTF8") == 0); + } + /* nl_langinfo items of the LC_NUMERIC category */ + ASSERT (strlen (nl_langinfo (RADIXCHAR)) > 0); + ASSERT (strlen (nl_langinfo (THOUSEP)) >= 0); + /* nl_langinfo items of the LC_TIME category */ + ASSERT (strlen (nl_langinfo (D_T_FMT)) > 0); + ASSERT (strlen (nl_langinfo (D_FMT)) > 0); + ASSERT (strlen (nl_langinfo (T_FMT)) > 0); + ASSERT (strlen (nl_langinfo (T_FMT_AMPM)) >= (pass == 0 ? 1 : 0)); + ASSERT (strlen (nl_langinfo (AM_STR)) >= (pass == 0 ? 1 : 0)); + ASSERT (strlen (nl_langinfo (PM_STR)) >= (pass == 0 ? 1 : 0)); + ASSERT (strlen (nl_langinfo (DAY_1)) > 0); + ASSERT (strlen (nl_langinfo (DAY_2)) > 0); + ASSERT (strlen (nl_langinfo (DAY_3)) > 0); + ASSERT (strlen (nl_langinfo (DAY_4)) > 0); + ASSERT (strlen (nl_langinfo (DAY_5)) > 0); + ASSERT (strlen (nl_langinfo (DAY_6)) > 0); + ASSERT (strlen (nl_langinfo (DAY_7)) > 0); + ASSERT (strlen (nl_langinfo (ABDAY_1)) > 0); + ASSERT (strlen (nl_langinfo (ABDAY_2)) > 0); + ASSERT (strlen (nl_langinfo (ABDAY_3)) > 0); + ASSERT (strlen (nl_langinfo (ABDAY_4)) > 0); + ASSERT (strlen (nl_langinfo (ABDAY_5)) > 0); + ASSERT (strlen (nl_langinfo (ABDAY_6)) > 0); + ASSERT (strlen (nl_langinfo (ABDAY_7)) > 0); + ASSERT (strlen (nl_langinfo (MON_1)) > 0); + ASSERT (strlen (nl_langinfo (MON_2)) > 0); + ASSERT (strlen (nl_langinfo (MON_3)) > 0); + ASSERT (strlen (nl_langinfo (MON_4)) > 0); + ASSERT (strlen (nl_langinfo (MON_5)) > 0); + ASSERT (strlen (nl_langinfo (MON_6)) > 0); + ASSERT (strlen (nl_langinfo (MON_7)) > 0); + ASSERT (strlen (nl_langinfo (MON_8)) > 0); + ASSERT (strlen (nl_langinfo (MON_9)) > 0); + ASSERT (strlen (nl_langinfo (MON_10)) > 0); + ASSERT (strlen (nl_langinfo (MON_11)) > 0); + ASSERT (strlen (nl_langinfo (MON_12)) > 0); + ASSERT (strlen (nl_langinfo (ALTMON_1)) > 0); + ASSERT (strlen (nl_langinfo (ALTMON_2)) > 0); + ASSERT (strlen (nl_langinfo (ALTMON_3)) > 0); + ASSERT (strlen (nl_langinfo (ALTMON_4)) > 0); + ASSERT (strlen (nl_langinfo (ALTMON_5)) > 0); + ASSERT (strlen (nl_langinfo (ALTMON_6)) > 0); + ASSERT (strlen (nl_langinfo (ALTMON_7)) > 0); + ASSERT (strlen (nl_langinfo (ALTMON_8)) > 0); + ASSERT (strlen (nl_langinfo (ALTMON_9)) > 0); + ASSERT (strlen (nl_langinfo (ALTMON_10)) > 0); + ASSERT (strlen (nl_langinfo (ALTMON_11)) > 0); + ASSERT (strlen (nl_langinfo (ALTMON_12)) > 0); + /* In the tested locales, alternate month names and month names ought to be + the same. */ + ASSERT (strcmp (nl_langinfo (ALTMON_1), nl_langinfo (MON_1)) == 0); + ASSERT (strcmp (nl_langinfo (ALTMON_2), nl_langinfo (MON_2)) == 0); + ASSERT (strcmp (nl_langinfo (ALTMON_3), nl_langinfo (MON_3)) == 0); + ASSERT (strcmp (nl_langinfo (ALTMON_4), nl_langinfo (MON_4)) == 0); + ASSERT (strcmp (nl_langinfo (ALTMON_5), nl_langinfo (MON_5)) == 0); + ASSERT (strcmp (nl_langinfo (ALTMON_6), nl_langinfo (MON_6)) == 0); + ASSERT (strcmp (nl_langinfo (ALTMON_7), nl_langinfo (MON_7)) == 0); + ASSERT (strcmp (nl_langinfo (ALTMON_8), nl_langinfo (MON_8)) == 0); + ASSERT (strcmp (nl_langinfo (ALTMON_9), nl_langinfo (MON_9)) == 0); + ASSERT (strcmp (nl_langinfo (ALTMON_10), nl_langinfo (MON_10)) == 0); + ASSERT (strcmp (nl_langinfo (ALTMON_11), nl_langinfo (MON_11)) == 0); + ASSERT (strcmp (nl_langinfo (ALTMON_12), nl_langinfo (MON_12)) == 0); + ASSERT (strlen (nl_langinfo (ABMON_1)) > 0); + ASSERT (strlen (nl_langinfo (ABMON_2)) > 0); + ASSERT (strlen (nl_langinfo (ABMON_3)) > 0); + ASSERT (strlen (nl_langinfo (ABMON_4)) > 0); + ASSERT (strlen (nl_langinfo (ABMON_5)) > 0); + ASSERT (strlen (nl_langinfo (ABMON_6)) > 0); + ASSERT (strlen (nl_langinfo (ABMON_7)) > 0); + ASSERT (strlen (nl_langinfo (ABMON_8)) > 0); + ASSERT (strlen (nl_langinfo (ABMON_9)) > 0); + ASSERT (strlen (nl_langinfo (ABMON_10)) > 0); + ASSERT (strlen (nl_langinfo (ABMON_11)) > 0); + ASSERT (strlen (nl_langinfo (ABMON_12)) > 0); + ASSERT (strlen (nl_langinfo (ERA)) >= 0); + ASSERT (strlen (nl_langinfo (ERA_D_FMT)) >= 0); + ASSERT (strlen (nl_langinfo (ERA_D_T_FMT)) >= 0); + ASSERT (strlen (nl_langinfo (ERA_T_FMT)) >= 0); + ASSERT (nl_langinfo (ALT_DIGITS) != NULL); + /* nl_langinfo items of the LC_MONETARY category */ + { + const char *currency = nl_langinfo (CRNCYSTR); + ASSERT (strlen (currency) >= 0); +#if !defined __NetBSD__ + if (pass > 0) + ASSERT (strlen (currency) >= 1); +#endif + } + /* nl_langinfo items of the LC_MESSAGES category */ + ASSERT (strlen (nl_langinfo (YESEXPR)) > 0); + ASSERT (strlen (nl_langinfo (NOEXPR)) > 0); + + return 0; +} diff --git a/tests/test-nl_langinfo1.sh b/tests/test-nl_langinfo1.sh new file mode 100755 index 0000000000..9acfcdd949 --- /dev/null +++ b/tests/test-nl_langinfo1.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +LC_ALL=C ${CHECKER} ./test-nl_langinfo1${EXEEXT} 0 || exit 1 + +# Test whether a specific traditional locale is installed. +: "${LOCALE_FR=fr_FR}" +if test $LOCALE_FR != none; then + LC_ALL=$LOCALE_FR ${CHECKER} ./test-nl_langinfo1${EXEEXT} 1 || exit 1 +fi + +# Test whether a specific UTF-8 locale is installed. +: "${LOCALE_FR_UTF8=fr_FR.UTF-8}" +if test $LOCALE_FR_UTF8 != none; then + LC_ALL=$LOCALE_FR_UTF8 ${CHECKER} ./test-nl_langinfo1${EXEEXT} 2 || exit 1 +fi + +exit 0