From: Bruno Haible Date: Thu, 5 Apr 2007 00:27:44 +0000 (+0000) Subject: FreeBSD 6.1 produces different printf output than glibc. X-Git-Tag: cvs-readonly~576 X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=473a9b7de5c73c87d73c8f046704a874ecf88ea5;p=gnulib.git FreeBSD 6.1 produces different printf output than glibc. --- diff --git a/ChangeLog b/ChangeLog index ed7fe19a5..bb1e91367 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,16 @@ 2007-04-04 Bruno Haible + * tests/test-vasnprintf-posix.c (test_function): Allow two possible + results for "%010a" of Infinity and NaN. + * tests/test-vasprintf-posix.c (test_function): Likewise. + * tests/test-snprintf-posix.h (test_function): Likewise. + * tests/test-sprintf-posix.h (test_function): Likewise. + * tests/test-fprintf-posix.h (test_function): Remove these tests. + * tests/test-fprintf-posix.out: Update. + Needed for FreeBSD 6.1. + +2007-04-04 Bruno Haible + * DEPENDENCIES: Remove mentions of tar and gzip, since they are not directly used by the gnulib modules nor by gnulib-tool. diff --git a/tests/test-fprintf-posix.h b/tests/test-fprintf-posix.h index 2d5eb9303..488f842b6 100644 --- a/tests/test-fprintf-posix.h +++ b/tests/test-fprintf-posix.h @@ -61,12 +61,6 @@ test_function (int (*my_fprintf) (FILE *, const char *, ...)) /* NaN. */ my_fprintf (stdout, "%a %d\n", NaN (), 33, 44, 55); - /* FLAG_ZERO with infinite number. */ - my_fprintf (stdout, "%010a %d\n", 1.0 / 0.0, 33, 44, 55); - - /* FLAG_ZERO with NaN. */ - my_fprintf (stdout, "%010a %d\n", NaN (), 33, 44, 55); - /* Test the support of the POSIX/XSI format strings with positions. */ my_fprintf (stdout, "%2$d %1$d\n", 33, 55); diff --git a/tests/test-fprintf-posix.out b/tests/test-fprintf-posix.out index 6f2e3d6db..ef1c249a6 100644 --- a/tests/test-fprintf-posix.out +++ b/tests/test-fprintf-posix.out @@ -6,6 +6,4 @@ inf 33 -inf 33 nan 33 - inf 33 - nan 33 55 33 diff --git a/tests/test-snprintf-posix.h b/tests/test-snprintf-posix.h index 52ad5ece8..098d0db86 100644 --- a/tests/test-snprintf-posix.h +++ b/tests/test-snprintf-posix.h @@ -341,7 +341,8 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) char result[100]; int retval = my_snprintf (result, sizeof (result), "%010a %d", 1.0 / 0.0, 33, 44, 55); - ASSERT (strcmp (result, " inf 33") == 0); + ASSERT (strcmp (result, " inf 33") == 0 + || strcmp (result, "0000000inf 33") == 0); ASSERT (retval == strlen (result)); } @@ -349,7 +350,8 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) char result[100]; int retval = my_snprintf (result, sizeof (result), "%010a %d", NaN (), 33, 44, 55); - ASSERT (strcmp (result, " nan 33") == 0); + ASSERT (strcmp (result, " nan 33") == 0 + || strcmp (result, "0000000nan 33") == 0); ASSERT (retval == strlen (result)); } @@ -599,7 +601,8 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) char result[100]; int retval = my_snprintf (result, sizeof (result), "%010La %d", 1.0L / 0.0L, 33, 44, 55); - ASSERT (strcmp (result, " inf 33") == 0); + ASSERT (strcmp (result, " inf 33") == 0 + || strcmp (result, "0000000inf 33") == 0); ASSERT (retval == strlen (result)); } @@ -607,7 +610,8 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) char result[100]; int retval = my_snprintf (result, sizeof (result), "%010La %d", 0.0L / 0.0L, 33, 44, 55); - ASSERT (strcmp (result, " nan 33") == 0); + ASSERT (strcmp (result, " nan 33") == 0 + || strcmp (result, "0000000nan 33") == 0); ASSERT (retval == strlen (result)); } diff --git a/tests/test-sprintf-posix.h b/tests/test-sprintf-posix.h index b5153c528..802783f1c 100644 --- a/tests/test-sprintf-posix.h +++ b/tests/test-sprintf-posix.h @@ -327,7 +327,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...)) char result[1000]; int retval = my_sprintf (result, "%010a %d", 1.0 / 0.0, 33, 44, 55); - ASSERT (strcmp (result, " inf 33") == 0); + ASSERT (strcmp (result, " inf 33") == 0 + || strcmp (result, "0000000inf 33") == 0); ASSERT (retval == strlen (result)); } @@ -335,7 +336,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...)) char result[1000]; int retval = my_sprintf (result, "%010a %d", NaN (), 33, 44, 55); - ASSERT (strcmp (result, " nan 33") == 0); + ASSERT (strcmp (result, " nan 33") == 0 + || strcmp (result, "0000000nan 33") == 0); ASSERT (retval == strlen (result)); } @@ -585,7 +587,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...)) char result[1000]; int retval = my_sprintf (result, "%010La %d", 1.0L / 0.0L, 33, 44, 55); - ASSERT (strcmp (result, " inf 33") == 0); + ASSERT (strcmp (result, " inf 33") == 0 + || strcmp (result, "0000000inf 33") == 0); ASSERT (retval == strlen (result)); } @@ -593,7 +596,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...)) char result[1000]; int retval = my_sprintf (result, "%010La %d", 0.0L / 0.0L, 33, 44, 55); - ASSERT (strcmp (result, " nan 33") == 0); + ASSERT (strcmp (result, " nan 33") == 0 + || strcmp (result, "0000000nan 33") == 0); ASSERT (retval == strlen (result)); } diff --git a/tests/test-vasnprintf-posix.c b/tests/test-vasnprintf-posix.c index 9b3785c8d..deda70a3c 100644 --- a/tests/test-vasnprintf-posix.c +++ b/tests/test-vasnprintf-posix.c @@ -416,7 +416,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...)) char *result = my_asnprintf (NULL, &length, "%010a %d", 1.0 / 0.0, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strcmp (result, " inf 33") == 0); + ASSERT (strcmp (result, " inf 33") == 0 + || strcmp (result, "0000000inf 33") == 0); ASSERT (length == strlen (result)); free (result); } @@ -426,7 +427,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...)) char *result = my_asnprintf (NULL, &length, "%010a %d", NaN (), 33, 44, 55); ASSERT (result != NULL); - ASSERT (strcmp (result, " nan 33") == 0); + ASSERT (strcmp (result, " nan 33") == 0 + || strcmp (result, "0000000nan 33") == 0); ASSERT (length == strlen (result)); free (result); } @@ -724,7 +726,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...)) char *result = my_asnprintf (NULL, &length, "%010La %d", 1.0L / 0.0L, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strcmp (result, " inf 33") == 0); + ASSERT (strcmp (result, " inf 33") == 0 + || strcmp (result, "0000000inf 33") == 0); ASSERT (length == strlen (result)); free (result); } @@ -734,7 +737,8 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...)) char *result = my_asnprintf (NULL, &length, "%010La %d", 0.0L / 0.0L, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strcmp (result, " nan 33") == 0); + ASSERT (strcmp (result, " nan 33") == 0 + || strcmp (result, "0000000nan 33") == 0); ASSERT (length == strlen (result)); free (result); } diff --git a/tests/test-vasprintf-posix.c b/tests/test-vasprintf-posix.c index 8a175b3f9..b4ffda2ae 100644 --- a/tests/test-vasprintf-posix.c +++ b/tests/test-vasprintf-posix.c @@ -397,7 +397,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%010a %d", 1.0 / 0.0, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strcmp (result, " inf 33") == 0); + ASSERT (strcmp (result, " inf 33") == 0 + || strcmp (result, "0000000inf 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -407,7 +408,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%010a %d", NaN (), 33, 44, 55); ASSERT (result != NULL); - ASSERT (strcmp (result, " nan 33") == 0); + ASSERT (strcmp (result, " nan 33") == 0 + || strcmp (result, "0000000nan 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -705,7 +707,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%010La %d", 1.0L / 0.0L, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strcmp (result, " inf 33") == 0); + ASSERT (strcmp (result, " inf 33") == 0 + || strcmp (result, "0000000inf 33") == 0); ASSERT (retval == strlen (result)); free (result); } @@ -715,7 +718,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%010La %d", 0.0L / 0.0L, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strcmp (result, " nan 33") == 0); + ASSERT (strcmp (result, " nan 33") == 0 + || strcmp (result, "0000000nan 33") == 0); ASSERT (retval == strlen (result)); free (result); }