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>
This commit is contained in:
Carlos O'Donell 2017-10-13 22:44:44 -07:00
parent 337ff3c501
commit 56fa555a83
13 changed files with 27 additions and 8 deletions

View File

@ -1,5 +1,29 @@
2017-10-25 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.
* localedata/unicode-gen/Makefile (check_i18n): Rename to
check_i18n_ctype. Depend on i18n_ctype-report. Check i18n_ctype-report
file.
@ -995,14 +1019,10 @@
* 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.
@ -1059,8 +1079,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.

View File

@ -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

View File

@ -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} \