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:43:20 -0400 |
| commit | 2b529a82afc15a76185fca16ba7bcc8fbd82d15d (patch) | |
| tree | f76ac3aede36195631c7c8ac343c1006c2690153 | |
| parent | c0769d60c1d107d9fb622e80c9d1110deb4fb3b4 (diff) | |
| download | glibc-2b529a82afc15a76185fca16ba7bcc8fbd82d15d.tar glibc-2b529a82afc15a76185fca16ba7bcc8fbd82d15d.tar.gz glibc-2b529a82afc15a76185fca16ba7bcc8fbd82d15d.tar.bz2 glibc-2b529a82afc15a76185fca16ba7bcc8fbd82d15d.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.
(cherry picked from commit facdd9ea29ab94aac2b188ec3cc41f8733d769e0)
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | string/Makefile | 2 | ||||
| -rw-r--r-- | string/bug-strcoll2.c | 3 |
3 files changed, 10 insertions, 2 deletions
@@ -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-08 Carlos O'Donell <carlos@redhat.com> [BZ #18589] 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 |