diff options
| author | Carlos O'Donell <carlos@systemhalted.org> | 2015-10-08 16:54:30 -0400 |
|---|---|---|
| committer | Carlos O'Donell <carlos@systemhalted.org> | 2015-10-09 16:42:08 -0400 |
| commit | c0769d60c1d107d9fb622e80c9d1110deb4fb3b4 (patch) | |
| tree | 13dc81b15de4839e05a06df9dd291159b1b48d65 | |
| parent | ed7f3a2e27e816488d5a8ef570052a5a2c3c515b (diff) | |
| download | glibc-c0769d60c1d107d9fb622e80c9d1110deb4fb3b4.tar.gz glibc-c0769d60c1d107d9fb622e80c9d1110deb4fb3b4.tar.xz glibc-c0769d60c1d107d9fb622e80c9d1110deb4fb3b4.zip | |
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)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | string/Makefile | 5 | ||||
| -rw-r--r-- | 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 <carlos@redhat.com> + + [BZ #18589] + * string/Makefile (tests): Add bug-strcoll2. + (LOCALES): Add cs_CZ.UTF-8. + 2015-09-28 Martin Sebor <msebor@redhat.com> [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; } } |