From: Bruno Haible Date: Sat, 20 Oct 2018 11:28:40 +0000 (+0200) Subject: Rename gettext-3 test to intl-setlocale-1. X-Git-Tag: v0.20~324 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fab7461a029ae696bea2ec9dc944187081de9c9;p=thirdparty%2Fgettext.git Rename gettext-3 test to intl-setlocale-1. * gettext-tools/tests/intl-setlocale-1: Renamed from gettext-tools/tests/gettext-3. * gettext-tools/tests/intl-setlocale-1-prg.c: Renamed from gettext-tools/tests/gettext-3-prg.c. * gettext-tools/tests/intl-setlocale-1-1.po: Renamed from gettext-tools/tests/gettext-3-1.po. * gettext-tools/tests/intl-setlocale-1-2.po: Renamed from gettext-tools/tests/gettext-3-2.po. * gettext-tools/tests/Makefile.am: Update. --- diff --git a/.gitignore b/.gitignore index bacba75b8..a7af2249d 100644 --- a/.gitignore +++ b/.gitignore @@ -659,8 +659,6 @@ autom4te.cache/ /gettext-tools/tests/fc4.exe /gettext-tools/tests/fc5 /gettext-tools/tests/fc5.exe -/gettext-tools/tests/gettext-3-prg -/gettext-tools/tests/gettext-3-prg.exe /gettext-tools/tests/gettext-4-prg /gettext-tools/tests/gettext-4-prg.exe /gettext-tools/tests/gettext-5-prg @@ -673,6 +671,8 @@ autom4te.cache/ /gettext-tools/tests/gettext-8-prg.exe /gettext-tools/tests/gettextpo-1-prg /gettext-tools/tests/gettextpo-1-prg.exe +/gettext-tools/tests/intl-setlocale-1-prg +/gettext-tools/tests/intl-setlocale-1-prg.exe /gettext-tools/tests/sentence-1-prg /gettext-tools/tests/sentence-1-prg.exe /gettext-tools/tests/testlocale diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am index 98d5c4b02..56ea61942 100644 --- a/gettext-tools/tests/Makefile.am +++ b/gettext-tools/tests/Makefile.am @@ -20,8 +20,9 @@ AUTOMAKE_OPTIONS = 1.11 gnits no-dependencies color-tests EXTRA_DIST = MOSTLYCLEANFILES = core *.stackdump -TESTS = gettext-1 gettext-2 gettext-3 gettext-4 gettext-5 gettext-6 gettext-7 \ - gettext-8 \ +TESTS = gettext-1 gettext-2 \ + intl-setlocale-1 \ + gettext-4 gettext-5 gettext-6 gettext-7 gettext-8 \ msgattrib-1 msgattrib-2 msgattrib-3 msgattrib-4 msgattrib-5 \ msgattrib-6 msgattrib-7 msgattrib-8 msgattrib-9 msgattrib-10 \ msgattrib-11 msgattrib-12 msgattrib-13 msgattrib-14 msgattrib-15 \ @@ -161,8 +162,8 @@ EXTRA_DIST += init.sh init.cfg $(TESTS) \ msguniq-a.in msguniq-a.inp msguniq-a.out \ qttest_pl.po qttest_pl.qm \ qttest2_de.po qttest2_de.qm qttest2_de.ts \ - gettext-3-1.po gettext-3-2.po gettext-4.po gettext-5.po \ - gettext-6-1.po gettext-6-2.po gettext-7.po \ + intl-setlocale-1-1.po intl-setlocale-1-2.po \ + gettext-4.po gettext-5.po gettext-6-1.po gettext-6-2.po gettext-7.po \ gettextpo-1.de.po \ xgettext-1 \ xgettext-c-1 xg-c-21.c \ @@ -219,7 +220,7 @@ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ LDADD = $(LDADD_@USE_INCLUDED_LIBINTL@) @INTL_MACOSX_LIBS@ LDADD_yes = ../intl/libintl.la @LTLIBTHREAD@ LDADD_no = ../intl/libgnuintl.la @LTLIBTHREAD@ @LTLIBINTL@ -check_PROGRAMS = tstgettext tstngettext testlocale gettext-3-prg gettext-4-prg gettext-5-prg gettext-6-prg gettext-7-prg gettext-8-prg cake fc3 fc4 fc5 gettextpo-1-prg sentence-1-prg +check_PROGRAMS = tstgettext tstngettext testlocale intl-setlocale-1-prg gettext-4-prg gettext-5-prg gettext-6-prg gettext-7-prg gettext-8-prg cake fc3 fc4 fc5 gettextpo-1-prg sentence-1-prg tstgettext_SOURCES = tstgettext.c setlocale.c tstgettext_CFLAGS = -DINSTALLDIR=\".\" tstgettext_LDADD = ../gnulib-lib/libgettextlib.la $(LDADD) @@ -227,8 +228,8 @@ tstngettext_SOURCES = tstngettext.c setlocale.c tstngettext_CFLAGS = -DINSTALLDIR=\".\" tstngettext_LDADD = ../gnulib-lib/libgettextlib.la $(LDADD) testlocale_SOURCES = testlocale.c -gettext_3_prg_SOURCES = gettext-3-prg.c -gettext_3_prg_LDADD = ../gnulib-lib/libgettextlib.la $(LDADD) +intl_setlocale_1_prg_SOURCES = intl-setlocale-1-prg.c +intl_setlocale_1_prg_LDADD = ../gnulib-lib/libgettextlib.la $(LDADD) gettext_4_prg_SOURCES = gettext-4-prg.c gettext_4_prg_LDADD = ../gnulib-lib/libgettextlib.la $(LDADD) gettext_5_prg_SOURCES = gettext-5-prg.c diff --git a/gettext-tools/tests/gettext-3 b/gettext-tools/tests/intl-setlocale-1 similarity index 61% rename from gettext-tools/tests/gettext-3 rename to gettext-tools/tests/intl-setlocale-1 index 404cee2af..15181a5a8 100755 --- a/gettext-tools/tests/gettext-3 +++ b/gettext-tools/tests/intl-setlocale-1 @@ -4,7 +4,8 @@ # Test that on glibc systems, gettext() works right even with intermediate # setlocale() calls. -# This test works only on glibc systems. +# This test works only on glibc systems, because it relies on HAVE_LOCALE_NULL +# being set. : ${GLIBC2=no} test "$GLIBC2" = yes || { echo "Skipping test: not a glibc system" @@ -29,17 +30,17 @@ LC_ALL=fr_FR.UTF-8 ../testlocale || { Exit 77 } -test -d gt-3 || mkdir gt-3 -test -d gt-3/de_DE || mkdir gt-3/de_DE -test -d gt-3/de_DE/LC_MESSAGES || mkdir gt-3/de_DE/LC_MESSAGES -test -d gt-3/fr_FR || mkdir gt-3/fr_FR -test -d gt-3/fr_FR/LC_MESSAGES || mkdir gt-3/fr_FR/LC_MESSAGES +test -d in-sl-1 || mkdir in-sl-1 +test -d in-sl-1/de_DE || mkdir in-sl-1/de_DE +test -d in-sl-1/de_DE/LC_MESSAGES || mkdir in-sl-1/de_DE/LC_MESSAGES +test -d in-sl-1/fr_FR || mkdir in-sl-1/fr_FR +test -d in-sl-1/fr_FR/LC_MESSAGES || mkdir in-sl-1/fr_FR/LC_MESSAGES : ${MSGFMT=msgfmt} -${MSGFMT} -o gt-3/de_DE/LC_MESSAGES/tstlang.mo "$abs_srcdir"/gettext-3-1.po -${MSGFMT} -o gt-3/fr_FR/LC_MESSAGES/tstlang.mo "$abs_srcdir"/gettext-3-2.po +${MSGFMT} -o in-sl-1/de_DE/LC_MESSAGES/tstprog.mo "$abs_srcdir"/intl-setlocale-1-1.po +${MSGFMT} -o in-sl-1/fr_FR/LC_MESSAGES/tstprog.mo "$abs_srcdir"/intl-setlocale-1-2.po -cat < gt-3.ok +cat < in-sl-1.ok String1 - Lang1: 1st string String2 - Lang1: 2nd string String1 - Lang2: 1st string @@ -48,9 +49,9 @@ String1 - First string for testing. String2 - Another string for testing. EOF -../gettext-3-prg > gt-3.out || Exit 1 +../intl-setlocale-1-prg > in-sl-1.out || Exit 1 : ${DIFF=diff} -${DIFF} gt-3.ok gt-3.out || Exit 1 +${DIFF} in-sl-1.ok in-sl-1.out || Exit 1 Exit 0 diff --git a/gettext-tools/tests/gettext-3-1.po b/gettext-tools/tests/intl-setlocale-1-1.po similarity index 100% rename from gettext-tools/tests/gettext-3-1.po rename to gettext-tools/tests/intl-setlocale-1-1.po diff --git a/gettext-tools/tests/gettext-3-2.po b/gettext-tools/tests/intl-setlocale-1-2.po similarity index 100% rename from gettext-tools/tests/gettext-3-2.po rename to gettext-tools/tests/intl-setlocale-1-2.po diff --git a/gettext-tools/tests/gettext-3-prg.c b/gettext-tools/tests/intl-setlocale-1-prg.c similarity index 90% rename from gettext-tools/tests/gettext-3-prg.c rename to gettext-tools/tests/intl-setlocale-1-prg.c index 2863930e3..0463d6c3c 100644 --- a/gettext-tools/tests/gettext-3-prg.c +++ b/gettext-tools/tests/intl-setlocale-1-prg.c @@ -1,5 +1,5 @@ -/* Test program, used by the gettext-3 test. - Copyright (C) 2000, 2005, 2007, 2015-2016 Free Software Foundation, Inc. +/* Test program, used by the intl-setlocale-1 test. + Copyright (C) 2000, 2005, 2007, 2015-2016, 2018 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 @@ -60,7 +60,7 @@ main (void) unsetenv ("LANG"); unsetenv ("OUTPUT_CHARSET"); - textdomain ("tstlang"); + textdomain ("tstprog"); for (i = 0; i < lang_cnt; ++i) { @@ -69,7 +69,7 @@ main (void) if (setlocale (LC_ALL, lang[i]) == NULL) setlocale (LC_ALL, "C"); - bindtextdomain ("tstlang", "gt-3"); + bindtextdomain ("tstprog", "in-sl-1"); for (j = 0; j < data_cnt; ++j) printf ("%s - %s\n", strings[j].selection,