From 770cbe147cf33580e05ba6de78993c3070c5c2f8 Mon Sep 17 00:00:00 2001 From: Mike FABIAN Date: Fri, 15 Dec 2017 07:19:45 +0100 Subject: 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 from "" collating-element from "" collating-element from "" collating-element from "" The new iso14651_t1_common file defines more collating elements, two of them are in the ISO-8859-1 range: collating-element from "" % decomposition of LATIN CAPITAL LETTER L WITH MIDDLE DOT collating-element from "" % 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. --- ChangeLog | 7 +++++++ posix/bug-regex5.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 954763f..4091d07 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2018-02-27 Mike FABIAN + * 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 + * 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 fd18b19..573da23 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; } -- cgit v1.1