diff options
| author | Marek Polacek <polacek@redhat.com> | 2012-03-08 02:46:43 -0500 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2012-03-08 02:46:43 -0500 |
| commit | 70bca0a394a2135927210007f1dd6eceafe1aaf5 (patch) | |
| tree | fd2d49cdbc9425032d506fe2d0d6002fd4385d75 | |
| parent | 67c6a3d919b492c68664c4b95e84efd2174309e7 (diff) | |
| download | glibc-70bca0a394a2135927210007f1dd6eceafe1aaf5.tar.gz glibc-70bca0a394a2135927210007f1dd6eceafe1aaf5.tar.xz glibc-70bca0a394a2135927210007f1dd6eceafe1aaf5.zip | |
Fix up long double fphex test
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | stdio-common/tst-long-dbl-fphex.c | 29 |
2 files changed, 26 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 43f23dd316..98a6457ffc 100644 --- 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 b57fb85ad7..d879c98e88 100644 --- 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 () |