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>

12 files changed, 3 insertions, 2 deletions

diff --git a/localedata/Makefile b/localedata/Makefile
index 84dbc5adbb..75f71bb8b2 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
index e9d2620d5d..e9d2620d5d 100644
--- a/localedata/da_DK.in
+++ b/localedata/da_DK.ISO-8859-1.in
diff --git a/localedata/de_DE.in b/localedata/de_DE.ISO-8859-1.in
index c56f401f64..c56f401f64 100644
--- a/localedata/de_DE.in
+++ b/localedata/de_DE.ISO-8859-1.in
diff --git a/localedata/en_US.in b/localedata/en_US.ISO-8859-1.in
index 6c543f35cf..6c543f35cf 100644
--- a/localedata/en_US.in
+++ b/localedata/en_US.ISO-8859-1.in
diff --git a/localedata/fr_FR.in b/localedata/fr_FR.UTF-8.in
index dd5c5330d5..dd5c5330d5 100644
--- a/localedata/fr_FR.in
+++ b/localedata/fr_FR.UTF-8.in
diff --git a/localedata/hr_HR.in b/localedata/hr_HR.ISO-8859-2.in
index ddf0952c5f..ddf0952c5f 100644
--- a/localedata/hr_HR.in
+++ b/localedata/hr_HR.ISO-8859-2.in
diff --git a/localedata/hu_HU.in b/localedata/hu_HU.UTF-8.in
index 7736ac08f7..7736ac08f7 100644
--- a/localedata/hu_HU.in
+++ b/localedata/hu_HU.UTF-8.in
diff --git a/localedata/si_LK.in b/localedata/si_LK.UTF-8.in
index dc6b22bcb7..dc6b22bcb7 100644
--- a/localedata/si_LK.in
+++ b/localedata/si_LK.UTF-8.in
diff --git a/localedata/sort-test.sh b/localedata/sort-test.sh
index 46ed5f0df6..17fb2622f0 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
index 6463e5e444..6463e5e444 100644
--- a/localedata/sv_SE.in
+++ b/localedata/sv_SE.ISO-8859-1.in
diff --git a/localedata/tr_TR.in b/localedata/tr_TR.UTF-8.in
index ecad4358b8..ecad4358b8 100644
--- a/localedata/tr_TR.in
+++ b/localedata/tr_TR.UTF-8.in
diff --git a/localedata/uk_UA.in b/localedata/uk_UA.UTF-8.in
index ff4d284d61..ff4d284d61 100644
--- a/localedata/uk_UA.in
+++ b/localedata/uk_UA.UTF-8.in