This is the mail archive of the mailing list for the glibc project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.22-357-gfacdd9e

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  facdd9ea29ab94aac2b188ec3cc41f8733d769e0 (commit)
      from  67ac0f74a4a5021f77566fdbe4cda5880eba8ba4 (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 -----------------------------------------------------------------;a=commitdiff;h=facdd9ea29ab94aac2b188ec3cc41f8733d769e0

commit facdd9ea29ab94aac2b188ec3cc41f8733d769e0
Author: Carlos O'Donell <>
Date:   Fri Oct 9 16:35:53 2015 -0400

    Fix typo in bug-strcoll2 (Bug 18589)
    Fix the copyright year and remove contributed by in the
    bug-strcoll2 test. In addition add the correct dependency
    on $(gen-locales) to ensure all the test locales are generated.

diff --git a/ChangeLog b/ChangeLog
index 23f6fe9..c47fd6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-10-09  Carlos O'Donell  <>
+	[BZ #18589]
+	* string/bug-strcoll2.c: Adjust copyright, and remove contributed by.
+	* string/Makefile ($(objpfx)bug-strcoll2.out): Depend on
+	$(gen-locales).
 2015-10-09  Adhemerval Zanella  <>
 	    Phil Blundell <>
@@ -120,6 +127,7 @@
 	[BZ #18589]
 	* string/Makefile (tests): Add bug-strcoll2.
 	(LOCALES): Add cs_CZ.UTF-8.
+	* string/bug-strcoll2.c (test_cs_CZ): Fix typo in FAIL string.
 	[BZ #18589]
 	* string/bug-strcoll2.c: New file.
diff --git a/string/Makefile b/string/Makefile
index 616fdec..ebe9354 100644
--- a/string/Makefile
+++ b/string/Makefile
@@ -85,5 +85,7 @@ $(objpfx)test-strcasecmp.out: $(gen-locales)
 $(objpfx)test-strncasecmp.out: $(gen-locales)
 $(objpfx)tst-strxfrm.out: $(gen-locales)
 $(objpfx)tst-strxfrm2.out: $(gen-locales)
+# bug-strcoll2 needs cs_CZ.UTF-8 and da_DK.ISO-8859-1.
+$(objpfx)bug-strcoll2.out: $(gen-locales)
diff --git a/string/bug-strcoll2.c b/string/bug-strcoll2.c
index 26cc873..72a9ff2 100644
--- a/string/bug-strcoll2.c
+++ b/string/bug-strcoll2.c
@@ -1,7 +1,6 @@
 /* Bug 18589: fails at random.
-   Copyright (C) 1998-2015 Free Software Foundation, Inc.
+   Copyright (C) 2015 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <>, 1998.
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public


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

GNU C Library master sources

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]