From ebda2086baa5c8558f720dd89ab61e56f98049de Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 21 Sep 2008 17:17:43 +0200 Subject: Allow 3-digit exponents in %e and %g results on 'long double'. --- tests/test-sprintf-posix.h | 78 +++++++++++++++++++++++++++++++++------------- 1 file changed, 57 insertions(+), 21 deletions(-) (limited to 'tests/test-sprintf-posix.h') diff --git a/tests/test-sprintf-posix.h b/tests/test-sprintf-posix.h index e491b1658e..ce87a3a1a9 100644 --- a/tests/test-sprintf-posix.h +++ b/tests/test-sprintf-posix.h @@ -1869,7 +1869,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...)) char result[1000]; int retval = my_sprintf (result, "%Le %d", 12.75L, 33, 44, 55); - ASSERT (strcmp (result, "1.275000e+01 33") == 0); + ASSERT (strcmp (result, "1.275000e+01 33") == 0 + || strcmp (result, "1.275000e+001 33") == 0); ASSERT (retval == strlen (result)); } @@ -1877,7 +1878,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...)) char result[1000]; int retval = my_sprintf (result, "%Le %d", 1234567.0L, 33, 44, 55); - ASSERT (strcmp (result, "1.234567e+06 33") == 0); + ASSERT (strcmp (result, "1.234567e+06 33") == 0 + || strcmp (result, "1.234567e+006 33") == 0); ASSERT (retval == strlen (result)); } @@ -1965,7 +1967,15 @@ test_function (int (*my_sprintf) (char *, const char *, ...)) char result[1000]; int retval = my_sprintf (result, "%Le", data[k].value); - ASSERT (strcmp (result, data[k].string) == 0); + const char *expected = data[k].string; + ASSERT (strcmp (result, expected) == 0 + /* Some implementations produce exponents with 3 digits. */ + || (strlen (result) == strlen (expected) + 1 + && memcmp (result, expected, strlen (expected) - 2) == 0 + && result[strlen (expected) - 2] == '0' + && strcmp (result + strlen (expected) - 1, + expected + strlen (expected) - 2) + == 0)); ASSERT (retval == strlen (result)); } } @@ -1974,7 +1984,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...)) char result[1000]; int retval = my_sprintf (result, "%Le %d", -0.03125L, 33, 44, 55); - ASSERT (strcmp (result, "-3.125000e-02 33") == 0); + ASSERT (strcmp (result, "-3.125000e-02 33") == 0 + || strcmp (result, "-3.125000e-002 33") == 0); ASSERT (retval == strlen (result)); } @@ -1982,7 +1993,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...)) char result[1000]; int retval = my_sprintf (result, "%Le %d", 0.0L, 33, 44, 55); - ASSERT (strcmp (result, "0.000000e+00 33") == 0); + ASSERT (strcmp (result, "0.000000e+00 33") == 0 + || strcmp (result, "0.000000e+000 33") == 0); ASSERT (retval == strlen (result)); } @@ -1991,7 +2003,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...)) int retval = my_sprintf (result, "%Le %d", -zerol, 33, 44, 55); if (have_minus_zero ()) - ASSERT (strcmp (result, "-0.000000e+00 33") == 0); + ASSERT (strcmp (result, "-0.000000e+00 33") == 0 + || strcmp (result, "-0.000000e+000 33") == 0); ASSERT (retval == strlen (result)); } @@ -2114,7 +2127,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...)) char result[1000]; int retval = my_sprintf (result, "%15Le %d", 1.75L, 33, 44, 55); - ASSERT (strcmp (result, " 1.750000e+00 33") == 0); + ASSERT (strcmp (result, " 1.750000e+00 33") == 0 + || strcmp (result, " 1.750000e+000 33") == 0); ASSERT (retval == strlen (result)); } @@ -2122,7 +2136,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...)) char result[1000]; int retval = my_sprintf (result, "%-15Le %d", 1.75L, 33, 44, 55); - ASSERT (strcmp (result, "1.750000e+00 33") == 0); + ASSERT (strcmp (result, "1.750000e+00 33") == 0 + || strcmp (result, "1.750000e+000 33") == 0); ASSERT (retval == strlen (result)); } @@ -2130,7 +2145,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...)) char result[1000]; int retval = my_sprintf (result, "%+Le %d", 1.75L, 33, 44, 55); - ASSERT (strcmp (result, "+1.750000e+00 33") == 0); + ASSERT (strcmp (result, "+1.750000e+00 33") == 0 + || strcmp (result, "+1.750000e+000 33") == 0); ASSERT (retval == strlen (result)); } @@ -2138,7 +2154,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...)) char result[1000]; int retval = my_sprintf (result, "% Le %d", 1.75L, 33, 44, 55); - ASSERT (strcmp (result, " 1.750000e+00 33") == 0); + ASSERT (strcmp (result, " 1.750000e+00 33") == 0 + || strcmp (result, " 1.750000e+000 33") == 0); ASSERT (retval == strlen (result)); } @@ -2146,7 +2163,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...)) char result[1000]; int retval = my_sprintf (result, "%#Le %d", 1.75L, 33, 44, 55); - ASSERT (strcmp (result, "1.750000e+00 33") == 0); + ASSERT (strcmp (result, "1.750000e+00 33") == 0 + || strcmp (result, "1.750000e+000 33") == 0); ASSERT (retval == strlen (result)); } @@ -2154,7 +2172,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...)) char result[1000]; int retval = my_sprintf (result, "%#.Le %d", 1.75L, 33, 44, 55); - ASSERT (strcmp (result, "2.e+00 33") == 0); + ASSERT (strcmp (result, "2.e+00 33") == 0 + || strcmp (result, "2.e+000 33") == 0); ASSERT (retval == strlen (result)); } @@ -2162,7 +2181,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...)) char result[1000]; int retval = my_sprintf (result, "%#.Le %d", 9.75L, 33, 44, 55); - ASSERT (strcmp (result, "1.e+01 33") == 0); + ASSERT (strcmp (result, "1.e+01 33") == 0 + || strcmp (result, "1.e+001 33") == 0); ASSERT (retval == strlen (result)); } @@ -2170,7 +2190,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...)) char result[1000]; int retval = my_sprintf (result, "%015Le %d", 1234.0L, 33, 44, 55); - ASSERT (strcmp (result, "0001.234000e+03 33") == 0); + ASSERT (strcmp (result, "0001.234000e+03 33") == 0 + || strcmp (result, "001.234000e+003 33") == 0); ASSERT (retval == strlen (result)); } @@ -2197,7 +2218,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...)) char result[1000]; int retval = my_sprintf (result, "%.Le %d", 1234.0L, 33, 44, 55); - ASSERT (strcmp (result, "1e+03 33") == 0); + ASSERT (strcmp (result, "1e+03 33") == 0 + || strcmp (result, "1e+003 33") == 0); ASSERT (retval == strlen (result)); } @@ -2205,7 +2227,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...)) char result[100]; int retval = my_sprintf (result, "%.4Le %d", 999.951L, 33, 44, 55); - ASSERT (strcmp (result, "9.9995e+02 33") == 0); + ASSERT (strcmp (result, "9.9995e+02 33") == 0 + || strcmp (result, "9.9995e+002 33") == 0); ASSERT (retval == strlen (result)); } @@ -2213,7 +2236,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...)) char result[100]; int retval = my_sprintf (result, "%.4Le %d", 999.996L, 33, 44, 55); - ASSERT (strcmp (result, "1.0000e+03 33") == 0); + ASSERT (strcmp (result, "1.0000e+03 33") == 0 + || strcmp (result, "1.0000e+003 33") == 0); ASSERT (retval == strlen (result)); } @@ -2508,7 +2532,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...)) char result[1000]; int retval = my_sprintf (result, "%Lg %d", 1234567.0L, 33, 44, 55); - ASSERT (strcmp (result, "1.23457e+06 33") == 0); + ASSERT (strcmp (result, "1.23457e+06 33") == 0 + || strcmp (result, "1.23457e+006 33") == 0); ASSERT (retval == strlen (result)); } @@ -2596,7 +2621,16 @@ test_function (int (*my_sprintf) (char *, const char *, ...)) char result[1000]; int retval = my_sprintf (result, "%Lg", data[k].value); - ASSERT (strcmp (result, data[k].string) == 0); + const char *expected = data[k].string; + ASSERT (strcmp (result, expected) == 0 + /* Some implementations produce exponents with 3 digits. */ + || (expected[strlen (expected) - 4] == 'e' + && strlen (result) == strlen (expected) + 1 + && memcmp (result, expected, strlen (expected) - 2) == 0 + && result[strlen (expected) - 2] == '0' + && strcmp (result + strlen (expected) - 1, + expected + strlen (expected) - 2) + == 0)); ASSERT (retval == strlen (result)); } } @@ -2793,7 +2827,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...)) char result[1000]; int retval = my_sprintf (result, "%#.Lg %d", 9.75L, 33, 44, 55); - ASSERT (strcmp (result, "1.e+01 33") == 0); + ASSERT (strcmp (result, "1.e+01 33") == 0 + || strcmp (result, "1.e+001 33") == 0); ASSERT (retval == strlen (result)); } @@ -2828,7 +2863,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...)) char result[1000]; int retval = my_sprintf (result, "%.Lg %d", 1234.0L, 33, 44, 55); - ASSERT (strcmp (result, "1e+03 33") == 0); + ASSERT (strcmp (result, "1e+03 33") == 0 + || strcmp (result, "1e+003 33") == 0); ASSERT (retval == strlen (result)); } -- cgit v1.2.1