From c0769d60c1d107d9fb622e80c9d1110deb4fb3b4 Mon Sep 17 00:00:00 2001 From: Carlos O'Donell Date: Thu, 8 Oct 2015 16:54:30 -0400 Subject: strcoll: Add bug-strcoll2 to testsuite (Bug 18589). Adds bug-strcoll2 to the string tests, along with the generation of required locales. (cherry picked from commit 02018629a1397d03eccceacaf2ee1c50e3c4001c) --- ChangeLog | 6 ++++++ string/Makefile | 5 +++-- string/bug-strcoll2.c | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5698424586..4854461f88 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2015-10-08 Carlos O'Donell + + [BZ #18589] + * string/Makefile (tests): Add bug-strcoll2. + (LOCALES): Add cs_CZ.UTF-8. + 2015-09-28 Martin Sebor [BZ #18969] 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; } } -- cgit 1.4.1