strcoll: Add bug-strcoll2 to testsuite (Bug 18589).

Adds bug-strcoll2 to the string tests, along with the
generation of required locales.
This commit is contained in:
Carlos O'Donell 2015-10-08 16:54:30 -04:00
parent 87701a58e2
commit 02018629a1
3 changed files with 9 additions and 4 deletions

View File

@ -1,5 +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.
[BZ #18589]
* string/bug-strcoll2.c: New file.
* locale/categories.def: Revert commit
@ -7,7 +11,7 @@
* 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.

View File

@ -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)

View File

@ -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;
}
}