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 9a0c04c..f8212a6 100644 (file)
--- 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 1aea4c9..e384940 100644 (file)
--- 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