diff options
| author | Carlos O'Donell <carlos@systemhalted.org> | 2015-10-09 16:35:53 -0400 |
|---|---|---|
| committer | Carlos O'Donell <carlos@systemhalted.org> | 2015-10-09 16:38:04 -0400 |
| commit | facdd9ea29ab94aac2b188ec3cc41f8733d769e0 (patch) | |
| tree | 3c6790397f56ec38cce93dc4ed13ce0030e1e0ab | |
| parent | 67ac0f74a4a5021f77566fdbe4cda5880eba8ba4 (diff) | |
| download | glibc-facdd9ea29ab94aac2b188ec3cc41f8733d769e0.tar.gz glibc-facdd9ea29ab94aac2b188ec3cc41f8733d769e0.tar.xz glibc-facdd9ea29ab94aac2b188ec3cc41f8733d769e0.zip | |
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.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | string/Makefile | 2 | ||||
| -rw-r--r-- | string/bug-strcoll2.c | 3 |
3 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 23f6fe9f76..c47fd6d899 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2015-10-09 Carlos O'Donell <carlos@redhat.com> + + [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 <adhemerval.zanella@linaro.org> Phil Blundell <pb@pbcui.dot.net> @@ -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 616fdeccdb..ebe9354cc1 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) endif diff --git a/string/bug-strcoll2.c b/string/bug-strcoll2.c index 26cc873e5b..72a9ff2d1c 100644 --- a/string/bug-strcoll2.c +++ b/string/bug-strcoll2.c @@ -1,7 +1,6 @@ /* Bug 18589: sort-test.sh 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 <drepper@cygnus.com>, 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 |