From patchwork Sat Oct 14 05:54:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos O'Donell X-Patchwork-Id: 23571 Received: (qmail 22506 invoked by alias); 14 Oct 2017 05:54:11 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 22495 invoked by uid 89); 14 Oct 2017 05:54:10 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.2 spammy=similarity, Locale X-HELO: mail-qk0-f171.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:organization:message-id:date :user-agent:mime-version:content-language; bh=SHgqQeLnOaTGl3jdpxD39eaz80AEKpfuCtd2JFZ6RB0=; b=L5diZjbPianFZYnY9+Pbh4wlE7bcDEVHjW0TFiFFW5v0dC3OO0Ce2CGVmXLdZkPFhI r8LH+A/wD9DHfM8rI/SlYpp5UfaUx0gAuled7yqo9jX9A2fmGDepxBBKs/gvwn0t+Vyy mPysGvk7OX48UadUp/8UY6lefXfXxM2wxtiAwuGnWDLBzZQUTt7h2eD0Dy7b4mQIpxDG vI5e3c1MUvgKDXZCuPr2lTGNmKy1P7mATHG7vGzS6nvYy/3a5aiPDxMupqvgQeq76NnB 7/ByIglNAJXaQF4ld+KwOlD2b0iic60DwDaqPH++j4cDXN16BFS+eNQoLL1t19mRseKM qVbw== X-Gm-Message-State: AMCzsaXX8AE8qs80WpbOqS8oZqVPvHFvprHJ1X8+wq6Zd1BoPAeaQ4gN 7q3C2daeKh1Ko0mkK9NT8g58uw== X-Google-Smtp-Source: ABhQp+QWsNbS95u13sGJZ2FUnqfqSfKO/pE6+WD1ffNLGzYMUP4EnSn5mGHygIQVuhA5420XiLqAQA== X-Received: by 10.55.148.3 with SMTP id w3mr5401590qkd.26.1507960447006; Fri, 13 Oct 2017 22:54:07 -0700 (PDT) To: GNU C Library , Mike Fabian From: Carlos O'Donell Subject: [PATCH] localedata: Locale and test name are the same. Message-ID: Date: Fri, 13 Oct 2017 22:54:03 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 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 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 to , since that's the only range that currently works (see bug 21302 which I'm trying to fix). OK to checkin? From 525be9e43d19d7d873a36ad150d21f0c1d293888 Mon Sep 17 00:00:00 2001 From: Carlos O'Donell 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 --- 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%) diff --git a/ChangeLog b/ChangeLog index 3c8c45e..12086e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,17 +1,39 @@ 2017-10-13 Carlos O'Donell + * 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 + [BZ #22295] * locale/programs/linereader.c (get_string): Don't warn on non-symbolic character. -2017-10-13 Carlos O'Donell - [BZ #22294] * locale/programs/ld-monetary.c (monetary_finish): Allow "" int_curr_symbol. -2017-10-13 Carlos O'Donell - [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 - * localedata/unicode-gen/Makefile (GENERATED): Use i18n_ctype. (REPORTS): Likewise. (check): Likewise. diff --git a/localedata/Makefile b/localedata/Makefile index 84dbc5a..75f71bb 100644 --- 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 46ed5f0..17fb262 100644 --- 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 -- 2.9.5