diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | string/Makefile | 5 | ||||
| -rw-r--r-- | string/bug-strcoll2.c | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index f2dcaed912..df07ebfabf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,13 +1,17 @@ 2015-10-08 Carlos O'Donell <carlos@redhat.com> [BZ #18589] + * string/Makefile (tests): Add bug-strcoll2. + (LOCALES): Add cs_CZ.UTF-8. + + [BZ #18589] * string/bug-strcoll2.c: New file. * locale/categories.def: Revert commit f13c2a8dff2329c6692a80176262ceaaf8a6f74e. * locale/langinfo.h: Likewise. * locale/localeinfo.h: Likewise. * locale/C-collate.c: Likewise. - * programs/ld-collate.c (collate_output): Likewise. + * locale/programs/ld-collate.c (collate_output): Likewise. * string/strcoll_l.c (STRDIFF): Likewise. (STRCOLL): Likewise. * wcsmbs/wcscoll_l.c: Likewise. diff --git a/string/Makefile b/string/Makefile index c543159afd..616fdeccdb 100644 --- a/string/Makefile +++ b/string/Makefile @@ -54,7 +54,7 @@ tests := tester inl-tester noinl-tester testcopy test-ffs \ tst-strtok tst-strxfrm bug-strcoll1 tst-strfry \ bug-strtok1 $(addprefix test-,$(strop-tests)) \ bug-envz1 tst-strxfrm2 tst-endian tst-svc2 \ - tst-strtok_r + tst-strtok_r bug-strcoll2 xtests = tst-strcoll-overflow @@ -77,7 +77,8 @@ $(objpfx)tst-svc-cmp.out: tst-svc.expect $(objpfx)tst-svc.out $(evaluate-test) LOCALES := de_DE.UTF-8 en_US.ISO-8859-1 en_US.UTF-8 \ - tr_TR.ISO-8859-9 tr_TR.UTF-8 + tr_TR.ISO-8859-9 tr_TR.UTF-8 cs_CZ.UTF-8 \ + da_DK.ISO-8859-1 include ../gen-locales.mk $(objpfx)test-strcasecmp.out: $(gen-locales) diff --git a/string/bug-strcoll2.c b/string/bug-strcoll2.c index 5ce2f94f34..26cc873e5b 100644 --- a/string/bug-strcoll2.c +++ b/string/bug-strcoll2.c @@ -47,7 +47,7 @@ test_cs_CZ (void) } else { - puts ("FAIL: Wrong sorting in cz_CZ.UTF-8."); + puts ("FAIL: Wrong sorting in cs_CZ.UTF-8."); return 1; } } |