From: Ulrich Drepper <drepper@gmail.com>
Date: Thu, 4 Aug 2011 21:47:24 +0000 (-0400)
Subject: Provide better output in string tests
X-Git-Tag: glibc-2.15~419
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16292eddd77f66002e2104848e75a0fb4d316692;p=thirdparty%2Fglibc.git

Provide better output in string tests

If IMPL is called with a macro for the first parameter the macro does not
get expanded before the string is stored in the impl_t data structure.
---

diff --git a/ChangeLog b/ChangeLog
index 9a0c04c9663..f8212a61c05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-08-04  Ulrich Drepper  <drepper@gmail.com>
 
+	* string/test-string.h (IMPL): Use __STRING to expand name and then
+	stringify it.
+
 	* string/test-strcmp.c: Unify most of the WIDE and !WIDE code.  Lots
 	of cleanups.
 
diff --git a/string/test-string.h b/string/test-string.h
index 1aea4c9cb9d..e384940469f 100644
--- a/string/test-string.h
+++ b/string/test-string.h
@@ -1,5 +1,5 @@
 /* Test and measure string and memory functions.
-   Copyright (C) 1999, 2002, 2004, 2008 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2004, 2008, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Jakub Jelinek <jakub@redhat.com>, 1999.
 
@@ -18,6 +18,8 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#include <sys/cdefs.h>
+
 typedef struct
 {
   const char *name;
@@ -29,7 +31,7 @@ extern impl_t __start_impls[], __stop_impls[];
 #define IMPL(name, test) \
   impl_t tst_ ## name							\
   __attribute__ ((section ("impls"), aligned (sizeof (void *))))	\
-    = { #name, (void (*) (void))name, test };
+       = { __STRING (name), (void (*) (void))name, test };
 
 #ifdef TEST_MAIN