From 57ec1201e41544144928901fa21f93085c9862d0 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 8 Feb 2023 23:38:08 +0100 Subject: [PATCH] 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. --- ChangeLog | 8 ++++++++ modules/nl_langinfo-tests | 10 +++++----- tests/{test-nl_langinfo.c => test-nl_langinfo1.c} | 0 tests/{test-nl_langinfo.sh => test-nl_langinfo1.sh} | 6 +++--- 4 files changed, 16 insertions(+), 8 deletions(-) rename tests/{test-nl_langinfo.c => test-nl_langinfo1.c} (100%) rename tests/{test-nl_langinfo.sh => test-nl_langinfo1.sh} (55%) 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_langinfo1.c similarity index 100% rename from tests/test-nl_langinfo.c rename to tests/test-nl_langinfo1.c diff --git a/tests/test-nl_langinfo.sh b/tests/test-nl_langinfo1.sh similarity index 55% rename from tests/test-nl_langinfo.sh rename to tests/test-nl_langinfo1.sh index a66672fe2c..9acfcdd949 100755 --- a/tests/test-nl_langinfo.sh +++ b/tests/test-nl_langinfo1.sh @@ -1,17 +1,17 @@ #!/bin/sh -LC_ALL=C ${CHECKER} ./test-nl_langinfo${EXEEXT} 0 || exit 1 +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_langinfo${EXEEXT} 1 || exit 1 + 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_langinfo${EXEEXT} 2 || exit 1 + LC_ALL=$LOCALE_FR_UTF8 ${CHECKER} ./test-nl_langinfo1${EXEEXT} 2 || exit 1 fi exit 0 -- 2.39.5