diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-09-08 18:01:07 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-09-08 18:01:07 -0400 |
| commit | 762011fe9ffded81448be4dc50a2b27faaafe4c9 (patch) | |
| tree | 3f250f2173f91e512cde97e26da61d0b9b05b15d | |
| parent | 4badf7e8d7b44e1b6b887ff94ca7933c4a0ee336 (diff) | |
| download | glibc-762011fe9ffded81448be4dc50a2b27faaafe4c9.tar.gz glibc-762011fe9ffded81448be4dc50a2b27faaafe4c9.tar.xz glibc-762011fe9ffded81448be4dc50a2b27faaafe4c9.zip | |
Move wide char tests to wcsmbs directory
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | string/Makefile | 6 | ||||
| -rw-r--r-- | string/test-wcscmp.c | 2 | ||||
| -rw-r--r-- | string/test-wmemcmp.c | 2 | ||||
| -rw-r--r-- | wcsmbs/Makefile | 5 | ||||
| -rw-r--r-- | wcsmbs/test-wcscmp.c | 2 | ||||
| -rw-r--r-- | wcsmbs/test-wmemcmp.c | 2 |
7 files changed, 23 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index 83e5130f1a..347e7e8553 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2011-09-08 Ulrich Drepper <drepper@gmail.com> + + * wcsmbs/test-wcscmp.c: Moved from string/*. Adjust. + * wcsmbs/test-wmemcmp.c: Likewise. + * string/Makefile (strop-tests): Remove wcscmp and wmemcmp. + * wcsmbs/Makefile (strop-tests): Add wcscmp and wmemcmp. + +2011-09-08 Liubov Dmitrieva <liubov.dmitrieva@gmail.com> + + * string/Makefile (strop-tests): Add memcmp. + * string/test-wmemcmp.c: New file. + * string/test-memcmp.c: Add wmemcmp support. + 2011-09-08 Roland McGrath <roland@hack.frob.com> [BZ #13153] diff --git a/string/Makefile b/string/Makefile index cc2a1ea4cc..ab100244df 100644 --- a/string/Makefile +++ b/string/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1991-2002, 2005-2008, 2009, 2010 Free Software Foundation, Inc. +# Copyright (C) 1991-2002, 2005-2010, 2011 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -46,11 +46,11 @@ routines := strcat strchr strcmp strcoll strcpy strcspn \ # for -fbounded-pointer compiles. Glibc uses memchr for explicit checks. o-objects.ob := memcpy.o memset.o memchr.o -strop-tests := wcscmp memchr memcmp memcpy memmove mempcpy memset memccpy \ +strop-tests := memchr memcmp memcpy memmove mempcpy memset memccpy \ stpcpy stpncpy strcat strchr strcmp strcpy strcspn \ strlen strncmp strncpy strpbrk strrchr strspn memmem \ strstr strcasestr strnlen strcasecmp strncasecmp \ - strncat wmemcmp + strncat tests := tester inl-tester noinl-tester testcopy test-ffs \ tst-strlen stratcliff tst-svc tst-inlcall \ bug-strncat1 bug-strspn1 bug-strpbrk1 tst-bswap \ diff --git a/string/test-wcscmp.c b/string/test-wcscmp.c deleted file mode 100644 index ac98e6d1d8..0000000000 --- a/string/test-wcscmp.c +++ /dev/null @@ -1,2 +0,0 @@ -#define WIDE 1 -#include "test-strcmp.c" diff --git a/string/test-wmemcmp.c b/string/test-wmemcmp.c deleted file mode 100644 index bbf3068f20..0000000000 --- a/string/test-wmemcmp.c +++ /dev/null @@ -1,2 +0,0 @@ -#define WIDE 1 -#include "test-memcmp.c" diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile index 907bb25580..dbb6756277 100644 --- a/wcsmbs/Makefile +++ b/wcsmbs/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1995-2000,2002,2003,2004,2005,2006,2007 +# Copyright (C) 1995-2000,2002,2003,2004,2005,2006,2007,2011 # Free Software Foundation, Inc. # This file is part of the GNU C Library. @@ -42,9 +42,10 @@ routines := wcscat wcschr wcscmp wcscpy wcscspn wcsdup wcslen wcsncat \ isoc99_wscanf isoc99_vwscanf isoc99_fwscanf isoc99_vfwscanf \ isoc99_swscanf isoc99_vswscanf +strop-tests := wcscmp wmemcmp tests := tst-wcstof wcsmbs-tst1 tst-wcsnlen tst-btowc tst-mbrtowc \ tst-wcrtomb tst-wcpncpy tst-mbsrtowcs tst-wchar-h tst-mbrtowc2 \ - wcsatcliff + wcsatcliff $(addprefix test-,$(strop-tests)) include ../Rules diff --git a/wcsmbs/test-wcscmp.c b/wcsmbs/test-wcscmp.c new file mode 100644 index 0000000000..aa18c30a61 --- /dev/null +++ b/wcsmbs/test-wcscmp.c @@ -0,0 +1,2 @@ +#define WIDE 1 +#include "../string/test-strcmp.c" diff --git a/wcsmbs/test-wmemcmp.c b/wcsmbs/test-wmemcmp.c new file mode 100644 index 0000000000..73bc4b72c8 --- /dev/null +++ b/wcsmbs/test-wmemcmp.c @@ -0,0 +1,2 @@ +#define WIDE 1 +#include "../string/test-memcmp.c" |