From 525be9e43d19d7d873a36ad150d21f0c1d293888 Mon Sep 17 00:00:00 2001
From: Carlos O'Donell <carlos@systemhalted.org>
Date: Fri, 13 Oct 2017 22:44:44 -0700
Subject: [PATCH] localedata: Locale and test name are the same.
The localedata collation test data is encoded in a particular
character set. We rename the test data to match the full locale
name with encoding, and adjust the Makefile and sort-test.sh
script. This allows us to have a future C.UTF-8 test that is
disambiguated from the built-in C locale.
Signed-off-by: Carlos O'Donell <carlos@redhat.com>
---
ChangeLog | 32 ++++++++++++++++++++++------
localedata/Makefile | 2 +-
localedata/{da_DK.in => da_DK.ISO-8859-1.in} | 0
localedata/{de_DE.in => de_DE.ISO-8859-1.in} | 0
localedata/{en_US.in => en_US.ISO-8859-1.in} | 0
localedata/{fr_FR.in => fr_FR.UTF-8.in} | 0
localedata/{hr_HR.in => hr_HR.ISO-8859-2.in} | 0
localedata/{hu_HU.in => hu_HU.UTF-8.in} | 0
localedata/{si_LK.in => si_LK.UTF-8.in} | 0
localedata/sort-test.sh | 3 ++-
localedata/{sv_SE.in => sv_SE.ISO-8859-1.in} | 0
localedata/{tr_TR.in => tr_TR.UTF-8.in} | 0
localedata/{uk_UA.in => uk_UA.UTF-8.in} | 0
13 files changed, 29 insertions(+), 8 deletions(-)
rename localedata/{da_DK.in => da_DK.ISO-8859-1.in} (100%)
rename localedata/{de_DE.in => de_DE.ISO-8859-1.in} (100%)
rename localedata/{en_US.in => en_US.ISO-8859-1.in} (100%)
rename localedata/{fr_FR.in => fr_FR.UTF-8.in} (100%)
rename localedata/{hr_HR.in => hr_HR.ISO-8859-2.in} (100%)
rename localedata/{hu_HU.in => hu_HU.UTF-8.in} (100%)
rename localedata/{si_LK.in => si_LK.UTF-8.in} (100%)
rename localedata/{sv_SE.in => sv_SE.ISO-8859-1.in} (100%)
rename localedata/{tr_TR.in => tr_TR.UTF-8.in} (100%)
rename localedata/{uk_UA.in => uk_UA.UTF-8.in} (100%)
@@ -1,17 +1,39 @@
2017-10-13 Carlos O'Donell <carlos@redhat.com>
+ * localedata/Makefile (test-input-data): Use full file name.
+ * localedata/da_DK.in: Rename to...
+ * localedata/da_DK.ISO-8859-1.in: ...this.
+ * localedata/de_DE.in: Rename to...
+ * localedata/de_DE.ISO-8859-1.in: ...this.
+ * localedata/en_US.in: Rename to...
+ * localedata/en_US.ISO-8859-1.in: ...this.
+ * localedata/fr_FR.in: Rename to...
+ * localedata/fr_FR.UTF-8.in: ... this.
+ * localedata/hr_HR.in: Rename to...
+ * localedata/hr_HR.ISO-8859-2.in: ...this.
+ * localedata/hu_HU.in: Rename to...
+ * localedata/hu_HU.UTF-8.in: ...this.
+ * localedata/si_LK.in: Rename to...
+ * localedata/si_LK.UTF-8.in: ...this.
+ * localedata/sv_SE.in: Rename to...
+ * localedata/sv_SE.ISO-8859-1.in: ...this.
+ * localedata/tr_TR.in: Rename to...
+ * localedata/tr_TR.UTF-8.in: ...this.
+ * localedata/uk_UA.in: Rename to...
+ * localedata/uk_UA.UTF-8.in: ...this.
+ * localedata/sort-test.sh: Test file is locale name with the
+ suffix.
+
+2017-10-13 Carlos O'Donell <carlos@redhat.com>
+
[BZ #22295]
* locale/programs/linereader.c (get_string): Don't warn on
non-symbolic character.
-2017-10-13 Carlos O'Donell <carlos@redhat.com>
-
[BZ #22294]
* locale/programs/ld-monetary.c (monetary_finish): Allow ""
int_curr_symbol.
-2017-10-13 Carlos O'Donell <carlos@redhat.com>
-
[BZ #22292]
* locale/programs/record-status.h: New file
* locale/programs/locale.c: Add comment.
@@ -68,8 +90,6 @@
* localedata/tst-locale.sh: Likewise.
* localedata/gen-locale.sh: Expect failures from SHIFT_JIS.
-2017-10-12 Carlos O'Donell <carlos@redhat.com>
-
* localedata/unicode-gen/Makefile (GENERATED): Use i18n_ctype.
(REPORTS): Likewise.
(check): Likewise.
@@ -38,7 +38,7 @@ test-srcs := collate-test xfrm-test tst-fmon tst-rpmatch tst-trans \
test-input := de_DE.ISO-8859-1 en_US.ISO-8859-1 da_DK.ISO-8859-1 \
hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 tr_TR.UTF-8 fr_FR.UTF-8 \
si_LK.UTF-8 uk_UA.UTF-8 hu_HU.UTF-8
-test-input-data = $(addsuffix .in, $(basename $(test-input)))
+test-input-data = $(addsuffix .in, $(test-input))
test-output := $(foreach s, .out .xout, \
$(addsuffix $s, $(basename $(test-input))))
ld-test-names := test1 test2 test3 test4 test5 test6 test7
similarity index 100%
rename from localedata/da_DK.in
rename to localedata/da_DK.ISO-8859-1.in
similarity index 100%
rename from localedata/de_DE.in
rename to localedata/de_DE.ISO-8859-1.in
similarity index 100%
rename from localedata/en_US.in
rename to localedata/en_US.ISO-8859-1.in
similarity index 100%
rename from localedata/fr_FR.in
rename to localedata/fr_FR.UTF-8.in
similarity index 100%
rename from localedata/hr_HR.in
rename to localedata/hr_HR.ISO-8859-2.in
similarity index 100%
rename from localedata/hu_HU.in
rename to localedata/hu_HU.UTF-8.in
similarity index 100%
rename from localedata/si_LK.in
rename to localedata/si_LK.UTF-8.in
@@ -32,7 +32,8 @@ here=`pwd`
status=0
for l in $lang; do
here=0
- cns=`echo $l | sed 's/\(.*\)[.][^.]*/\1/'`
+ # Locale name matches test filename (without in).
+ cns=$l
${test_program_prefix_before_env} \
${run_program_env} \
LC_ALL=$l ${test_program_prefix_after_env} \
similarity index 100%
rename from localedata/sv_SE.in
rename to localedata/sv_SE.ISO-8859-1.in
similarity index 100%
rename from localedata/tr_TR.in
rename to localedata/tr_TR.UTF-8.in
similarity index 100%
rename from localedata/uk_UA.in
rename to localedata/uk_UA.UTF-8.in
--
2.9.5
The localedata collation test data is encoded in a particular character set. We rename the test data to match the full locale name with encoding, and adjust the Makefile and sort-test.sh script. This allows us to have a future C.UTF-8 test that is disambiguated from the built-in C locale. Signed-off-by: Carlos O'Donell <carlos@redhat.com> Tested on x86_64, no test regressions. Tested building all locales on x86_64. Tested building my new C.UTF-8 locale and running through collation testing for code point sorting from <U0000> to <UFFFF>, since that's the only range that currently works (see bug 21302 which I'm trying to fix). OK to checkin?