* 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 <bruno@clisp.org>
+
+ 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 <bruno@clisp.org>
assert-h: Fix test failure on IRIX 6.5.
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
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)
+++ /dev/null
-/* 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 <https://www.gnu.org/licenses/>. */
-
-/* Written by Bruno Haible <bruno@clisp.org>, 2009. */
-
-#include <config.h>
-
-#include <langinfo.h>
-
-#include "signature.h"
-SIGNATURE_CHECK (nl_langinfo, char *, (nl_item));
-
-#include <locale.h>
-#include <stdlib.h>
-#include <string.h>
-
-#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;
-}
+++ /dev/null
-#!/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
--- /dev/null
+/* 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 <https://www.gnu.org/licenses/>. */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2009. */
+
+#include <config.h>
+
+#include <langinfo.h>
+
+#include "signature.h"
+SIGNATURE_CHECK (nl_langinfo, char *, (nl_item));
+
+#include <locale.h>
+#include <stdlib.h>
+#include <string.h>
+
+#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;
+}
--- /dev/null
+#!/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