Clean up tst-fphex test

diff --git a/ChangeLog b/ChangeLog
index 483757d58b800ba69e8b0a936ad04c79c5b9ab08..698655939cabf05587b022da34290a62210c1ea9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-03-08  Ulrich Drepper  <drepper@gmail.com>
+
+       * stdio-common/tst-fphex.c: Various cleanups.  The macros cannot
+       be defined individually, they must be defined as a block.  Define
+       S for printing a string instead of hidint the different by using a
+       macro for adding the 'l'.
+       * stdio-common/tst-fphex-wide.c: Adjust.
+
 2012-03-07  Marek Polacek  <polacek@redhat.com>
 
        * stdio-common/tst-long-dbl-fphex.c: Fix test for non ldbl-96 targets.

diff --git a/stdio-common/tst-fphex-wide.c b/stdio-common/tst-fphex-wide.c
index 2fd9f6ae3e30fd6483836b2c61d419bb1d9ec5d6..04d913561f9a6c28aff02611626d0a5cdd00ebd0 100644 (file)
--- a/stdio-common/tst-fphex-wide.c
+++ b/stdio-common/tst-fphex-wide.c
@@ -19,12 +19,6 @@
 
 #include <wchar.h>
 
-#define STR_LEN wcslen
-#define SPRINT swprintf
-#define STR_CMP wcscmp
-#define CHAR_T wchar_t
-#define PRINT wprintf
-#define L_(Str)        L##Str
-#define L "l"
+#define WIDE 1
 
 #include "tst-fphex.c"

diff --git a/stdio-common/tst-fphex.c b/stdio-common/tst-fphex.c
index 4465bfb81a44e4bdabf404e5c144e5b2713a7713..c2e8961d621fd42f33ccda9f2205aa908259c144 100644 (file)
--- a/stdio-common/tst-fphex.c
+++ b/stdio-common/tst-fphex.c
@@ -3,26 +3,22 @@
 #include <stdio.h>
 #include <string.h>
 
-#ifndef STR_LEN
+#ifndef WIDE
 # define STR_LEN strlen
-#endif
-#ifndef STR_CMP
 # define STR_CMP strcmp
-#endif
-#ifndef SPRINT
 # define SPRINT snprintf
-#endif
-#ifndef CHAR_T
 # define CHAR_T char
-#endif
-#ifndef PRINT
 # define PRINT printf
-#endif
-#ifndef L_
 # define L_(Str) Str
-#endif
-#ifndef L
-# define L
+# define S "%s"
+#else
+# define STR_LEN wcslen
+# define SPRINT swprintf
+# define STR_CMP wcscmp
+# define CHAR_T wchar_t
+# define PRINT wprintf
+# define L_(Str) L##Str
+# define S "%ls"
 #endif
 
 struct testcase
@@ -61,8 +57,9 @@ do_test (void)
       int n = SPRINT (buf, sizeof buf / sizeof (buf[0]), t->fmt, t->value);
       if (n != STR_LEN (t->expect) || STR_CMP (buf, t->expect) != 0)
        {
-         PRINT (L_("%" L "s\tExpected \"%" L "s\" (%Zu)\n\tGot      \"%" L
-                "s\" (%d, %Zu)\n"), t->fmt, t->expect, STR_LEN (t->expect),
+         PRINT (L_("" S "\tExpected \"" S "\" (%Zu)\n\tGot      \""
+                   S "\" (%d, %Zu)\n"),
+                t->fmt, t->expect, STR_LEN (t->expect),
                 buf, n, STR_LEN (buf));
          result = 1;
        }