Fix up long double fphex test

diff --git a/ChangeLog b/ChangeLog
index 43f23dd..98a6457 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-07  Marek Polacek  <polacek@redhat.com>
+
+       * stdio-common/tst-long-dbl-fphex.c: Fix test for non ldbl-96 targets.
+
 2012-03-08  Joseph Myers  <joseph@codesourcery.com>
 
        [BZ #6911]

diff --git a/stdio-common/tst-long-dbl-fphex.c b/stdio-common/tst-long-dbl-fphex.c
index b57fb85..d879c98 100644 (file)
--- a/stdio-common/tst-long-dbl-fphex.c
+++ b/stdio-common/tst-long-dbl-fphex.c
@@ -24,14 +24,29 @@ static int do_test (void);
 static int
 do_test (void)
 {
+#ifndef NO_LONG_DOUBLE
+  int result = 0;
   const long double x = 24.5;
-  wchar_t a[16 * sizeof (wchar_t)];
-  swprintf (a, 16 * sizeof (wchar_t), L"%La\n", x);
-  wchar_t A[16 * sizeof (wchar_t)];
-  swprintf (A, 16 * sizeof (wchar_t), L"%LA\n", x);
-
-  return (wmemcmp (a, L"0xc.4p+1", 8) != 0
-         || wmemcmp (A, L"0XC.4P+1", 8) != 0);
+  wchar_t a[16];
+  swprintf (a, sizeof (a), L"%La\n", x);
+  wchar_t A[16];
+  swprintf (A, sizeof (A) / sizeof (A[0]), L"%LA\n", x);
+
+  /* Here wprintf can return four valid variants.  We must accept all
+     of them.  */
+  result |= (wmemcmp (a, L"0xc.4p+1", 8) == 0
+            && wmemcmp (A, L"0XC.4P+1", 8) == 0);
+  result |= (wmemcmp (a, L"0x3.1p+3", 8) == 0
+            && wmemcmp (A, L"0X3.1P+3", 8) == 0);
+  result |= (wmemcmp (a, L"0x6.2p+2", 8) == 0
+            && wmemcmp (A, L"0X6.2P+2", 8) == 0);
+  result |= (wmemcmp (a, L"0x1.88p+4", 8) == 0
+            && wmemcmp (A, L"0X1.88P+4", 8) == 0);
+
+  return result != 1;
+#else
+  return 0;
+#endif
 }
 
 #define TEST_FUNCTION do_test ()