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>

diff --git a/ChangeLog b/ChangeLog
index 070d07f5b2afcc617f40d78d4aba4b5cfbbce3ed..9ae9618aa94f6f00e6278731bc96ff54e786264c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.

diff --git a/localedata/Makefile b/localedata/Makefile
index 84dbc5adbbc6af6397ad1a07ace14e3b898a3307..75f71bb8b25c398b8b188866435eae187d9d759c 100644 (file)
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -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

diff --git a/localedata/da_DK.in b/localedata/da_DK.ISO-8859-1.in
similarity index 100%
rename from localedata/da_DK.in
rename to localedata/da_DK.ISO-8859-1.in

diff --git a/localedata/de_DE.in b/localedata/de_DE.ISO-8859-1.in
similarity index 100%
rename from localedata/de_DE.in
rename to localedata/de_DE.ISO-8859-1.in

diff --git a/localedata/en_US.in b/localedata/en_US.ISO-8859-1.in
similarity index 100%
rename from localedata/en_US.in
rename to localedata/en_US.ISO-8859-1.in

diff --git a/localedata/fr_FR.in b/localedata/fr_FR.UTF-8.in
similarity index 100%
rename from localedata/fr_FR.in
rename to localedata/fr_FR.UTF-8.in

diff --git a/localedata/hr_HR.in b/localedata/hr_HR.ISO-8859-2.in
similarity index 100%
rename from localedata/hr_HR.in
rename to localedata/hr_HR.ISO-8859-2.in

diff --git a/localedata/hu_HU.in b/localedata/hu_HU.UTF-8.in
similarity index 100%
rename from localedata/hu_HU.in
rename to localedata/hu_HU.UTF-8.in

diff --git a/localedata/si_LK.in b/localedata/si_LK.UTF-8.in
similarity index 100%
rename from localedata/si_LK.in
rename to localedata/si_LK.UTF-8.in

diff --git a/localedata/sort-test.sh b/localedata/sort-test.sh
index 46ed5f0df6c8813942cb9c9d1068b2547343cba9..17fb2622f06b2288129eceba5d37fcacb26f0efa 100644 (file)
--- a/localedata/sort-test.sh
+++ b/localedata/sort-test.sh
@@ -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} \

diff --git a/localedata/sv_SE.in b/localedata/sv_SE.ISO-8859-1.in
similarity index 100%
rename from localedata/sv_SE.in
rename to localedata/sv_SE.ISO-8859-1.in

diff --git a/localedata/tr_TR.in b/localedata/tr_TR.UTF-8.in
similarity index 100%
rename from localedata/tr_TR.in
rename to localedata/tr_TR.UTF-8.in

diff --git a/localedata/uk_UA.in b/localedata/uk_UA.UTF-8.in
similarity index 100%
rename from localedata/uk_UA.in
rename to localedata/uk_UA.UTF-8.in