GNU C Library master sources branch master updated. glibc-2.22-348-g0201862

carlos@sourceware.org carlos@sourceware.org
Thu Oct 8 21:03:00 GMT 2015


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  02018629a1397d03eccceacaf2ee1c50e3c4001c (commit)
      from  87701a58e291bd7ac3b407d10a829dac52c9c16e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=02018629a1397d03eccceacaf2ee1c50e3c4001c

commit 02018629a1397d03eccceacaf2ee1c50e3c4001c
Author: Carlos O'Donell <carlos@systemhalted.org>
Date:   Thu Oct 8 16:54:30 2015 -0400

    strcoll: Add bug-strcoll2 to testsuite (Bug 18589).
    
    Adds bug-strcoll2 to the string tests, along with the
    generation of required locales.

diff --git a/ChangeLog b/ChangeLog
index f2dcaed..df07ebf 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 c543159..616fdec 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 5ce2f94..26cc873 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;
     }
 }

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog             |    6 +++++-
 string/Makefile       |    5 +++--
 string/bug-strcoll2.c |    2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources



More information about the Glibc-cvs mailing list