about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMike FABIAN <mfabian@redhat.com>2017-12-15 07:19:45 +0100
committerMike FABIAN <mfabian@redhat.com>2018-02-27 16:58:44 +0100
commit770cbe147cf33580e05ba6de78993c3070c5c2f8 (patch)
tree22a69649d31dc932bb8e3a36ca1a84a86dad3004
parent0fc355d9a7b3cc9d5e4190ce929e1eb4459ef0ea (diff)
downloadglibc-770cbe147cf33580e05ba6de78993c3070c5c2f8.tar.gz
glibc-770cbe147cf33580e05ba6de78993c3070c5c2f8.tar.xz
glibc-770cbe147cf33580e05ba6de78993c3070c5c2f8.zip
Fix posix/bug-regex5.c test case, adapt to iso14651_t1_common upate
This test case tests how many collating elements are defined in
da_DK.ISO-8859-1 locale. The da_DK locale source defines 4:

collating-element <A-A> from "<U0041><U0041>"
collating-element <A-a> from "<U0041><U0061>"
collating-element <a-A> from "<U0061><U0041>"
collating-element <a-a> from "<U0061><U0061>"

The new iso14651_t1_common file defines more collating elements, two
of them are in the ISO-8859-1 range:

collating-element <U004C_00B7> from "<U004C><U00B7>" % decomposition of LATIN CAPITAL LETTER L WITH MIDDLE DOT
collating-element <U006C_00B7> from "<U006C><U00B7>" % decomposition of LATIN SMALL LETTER L WITH MIDDLE DOT

So the total count is now 6 instead of 4.

	* posix/bug-regex5.c: Fix test case because with the new
        iso14651_t1_common file, the da_DK locale now has 6 collating elements
        in the ISO-8859-1 range instead of 4 with the old iso14651_t1_common
        file.
-rw-r--r--ChangeLog7
-rw-r--r--posix/bug-regex5.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 954763fac7..4091d0717b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2018-02-27  Mike FABIAN  <mfabian@redhat.com>
 
+	* posix/bug-regex5.c: Fix test case because with the new
+	iso14651_t1_common file, the da_DK locale now has 6 collating elements
+	in the ISO-8859-1 range instead of 4 with the old iso14651_t1_common
+	file.
+
+2018-02-27  Mike FABIAN  <mfabian@redhat.com>
+
 	* localedata/da_DK.ISO-8859-1.in: In the new iso14651_t1_common file
 	downloaded from ISO, the collation order of @-. and space has changed.
 	Therefore, this test file needed to be adapted.
diff --git a/posix/bug-regex5.c b/posix/bug-regex5.c
index fd18b19df4..573da231e3 100644
--- a/posix/bug-regex5.c
+++ b/posix/bug-regex5.c
@@ -53,9 +53,9 @@ main (void)
       printf ("No collating element!\n");
       return 1;
     }
-  else if (found != 4)
+  else if (found != 6)
     {
-      printf ("expected 4 collating elements, found %d\n", found);
+      printf ("expected 6 collating elements, found %d\n", found);
       return 1;
     }