Fix problem with reuse of test-strcpy for wide char testing

diff --git a/ChangeLog b/ChangeLog
index f31cc94f75c2c30c236adab3afb3d7dfd572f792..3c762492c49082cf2c09fa8fa50572a3420f7de6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-07  Ulrich Drepper  <drepper@gmail.com>
+
+       * string/test-strcpy.c (do_one_test): Fix format string for WIDE use.
+
 2012-01-03  Ulrich Drepper  <drepper@gmail.com>
 
        * iconv/loop.c (single loop): Fix assertion in storing of

diff --git a/string/test-strcpy.c b/string/test-strcpy.c
index 01a46de3c3b55dbc60b0e8d95720d86aaba8c3ef..04d9897b6788e130cc8c64472b6b9d799d495895 100644 (file)
--- a/string/test-strcpy.c
+++ b/string/test-strcpy.c
@@ -1,5 +1,5 @@
 /* Test and measure strcpy functions.
-   Copyright (C) 1999, 2002, 2003, 2005, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2003, 2005, 2011, 2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Jakub Jelinek <jakub@redhat.com>, 1999.
    Added wcscpy support by Liubov Dmitrieva <liubov.dmitrieva@gmail.com>, 2011
@@ -23,6 +23,7 @@
 # include <wchar.h>
 # define CHAR wchar_t
 # define UCHAR wchar_t
+# define sfmt "ls"
 # define BIG_CHAR WCHAR_MAX
 # define SMALL_CHAR 1273
 # define STRCMP wcscmp
@@ -31,6 +32,7 @@
 #else
 # define CHAR char
 # define UCHAR unsigned char
+# define sfmt "s"
 # define BIG_CHAR CHAR_MAX
 # define SMALL_CHAR 127
 # define STRCMP strcmp
@@ -80,7 +82,8 @@ do_one_test (impl_t *impl, CHAR *dst, const CHAR *src,
 
   if (STRCMP (dst, src) != 0)
     {
-      error (0, 0, "Wrong result in function %s dst \"%s\" src \"%s\"",
+      error (0, 0,
+            "Wrong result in function %s dst \"%" sfmt "\" src \"%" sfmt "\"",
             impl->name, dst, src);
       ret = 1;
       return;