X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-vasprintf-posix.c;h=6a28cffbfa9dc6e0f2e9ec40ac56e109e82ebe13;hb=7e54a06ab9eaaef1c529fd9e8a09874ef3c1b16b;hp=5b586ad7e785784da0d9dc3af700fe93a9c21c7a;hpb=ea98c65f5f6a100300e452a5a3ab800d566c41c4;p=gnulib.git

diff --git a/tests/test-vasprintf-posix.c b/tests/test-vasprintf-posix.c
index 5b586ad7e..6a28cffbf 100644
--- a/tests/test-vasprintf-posix.c
+++ b/tests/test-vasprintf-posix.c
@@ -1,5 +1,5 @@
 /* Test of POSIX compatible vasprintf() and asprintf() functions.
-   Copyright (C) 2007-2010 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -29,6 +29,7 @@
 
 #include "macros.h"
 #include "minus-zero.h"
+#include "infinity.h"
 #include "nan.h"
 
 /* The SGI MIPS floating-point format does not distinguish 0.0 and -0.0.  */
@@ -197,7 +198,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
   { /* Positive infinity.  */
     char *result;
     int retval =
-      my_asprintf (&result, "%a %d", 1.0 / 0.0, 33, 44, 55);
+      my_asprintf (&result, "%a %d", Infinityd (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "inf 33") == 0);
     ASSERT (retval == strlen (result));
@@ -207,7 +208,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
   { /* Negative infinity.  */
     char *result;
     int retval =
-      my_asprintf (&result, "%a %d", -1.0 / 0.0, 33, 44, 55);
+      my_asprintf (&result, "%a %d", - Infinityd (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "-inf 33") == 0);
     ASSERT (retval == strlen (result));
@@ -231,7 +232,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
     int retval =
       my_asprintf (&result, "%.0a %d", 1.5, 33, 44, 55);
     ASSERT (result != NULL);
-    ASSERT (strcmp (result, "0x2p+0 33") == 0
+    ASSERT (strcmp (result, "0x1p+0 33") == 0
+            || strcmp (result, "0x2p+0 33") == 0
             || strcmp (result, "0x3p-1 33") == 0
             || strcmp (result, "0x6p-2 33") == 0
             || strcmp (result, "0xcp-3 33") == 0);
@@ -244,7 +246,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
     int retval =
       my_asprintf (&result, "%.0a %d", 1.51, 33, 44, 55);
     ASSERT (result != NULL);
-    ASSERT (strcmp (result, "0x2p+0 33") == 0
+    ASSERT (strcmp (result, "0x1p+0 33") == 0
+            || strcmp (result, "0x2p+0 33") == 0
             || strcmp (result, "0x3p-1 33") == 0
             || strcmp (result, "0x6p-2 33") == 0
             || strcmp (result, "0xcp-3 33") == 0);
@@ -305,7 +308,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
   }
 
   { /* Rounding can turn a ...FFF into a ...000.
-       This shows a MacOS X 10.3.9 (Darwin 7.9) bug.  */
+       This shows a Mac OS X 10.3.9 (Darwin 7.9) bug.  */
     char *result;
     int retval =
       my_asprintf (&result, "%.1a %d", 1.999, 33, 44, 55);
@@ -438,7 +441,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
   { /* FLAG_ZERO with infinite number.  */
     char *result;
     int retval =
-      my_asprintf (&result, "%010a %d", 1.0 / 0.0, 33, 44, 55);
+      my_asprintf (&result, "%010a %d", Infinityd (), 33, 44, 55);
     ASSERT (result != NULL);
     /* "0000000inf 33" is not a valid result; see
        <http://lists.gnu.org/archive/html/bug-gnulib/2007-04/msg00107.html> */
@@ -511,7 +514,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
   { /* Positive infinity.  */
     char *result;
     int retval =
-      my_asprintf (&result, "%La %d", 1.0L / 0.0L, 33, 44, 55);
+      my_asprintf (&result, "%La %d", Infinityl (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "inf 33") == 0);
     ASSERT (retval == strlen (result));
@@ -521,7 +524,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
   { /* Negative infinity.  */
     char *result;
     int retval =
-      my_asprintf (&result, "%La %d", -1.0L / 0.0L, 33, 44, 55);
+      my_asprintf (&result, "%La %d", - Infinityl (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "-inf 33") == 0);
     ASSERT (retval == strlen (result));
@@ -539,7 +542,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
     ASSERT (retval == strlen (result));
     free (result);
   }
-#if CHECK_PRINTF_SAFE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_))
+#if CHECK_PRINTF_SAFE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_)) && !HAVE_SAME_LONG_DOUBLE_AS_DOUBLE
   { /* Quiet NaN.  */
     static union { unsigned int word[4]; long double value; } x =
       { LDBL80_WORDS (0xFFFF, 0xC3333333, 0x00000000) };
@@ -720,7 +723,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
   }
 
   { /* Rounding can turn a ...FFF into a ...000.
-       This shows a MacOS X 10.3.9 (Darwin 7.9) bug and a
+       This shows a Mac OS X 10.3.9 (Darwin 7.9) bug and a
        glibc 2.4 bug <http://sourceware.org/bugzilla/show_bug.cgi?id=2908>.  */
     char *result;
     int retval =
@@ -854,7 +857,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
   { /* FLAG_ZERO with infinite number.  */
     char *result;
     int retval =
-      my_asprintf (&result, "%010La %d", 1.0L / 0.0L, 33, 44, 55);
+      my_asprintf (&result, "%010La %d", Infinityl (), 33, 44, 55);
     ASSERT (result != NULL);
     /* "0000000inf 33" is not a valid result; see
        <http://lists.gnu.org/archive/html/bug-gnulib/2007-04/msg00107.html> */
@@ -1024,7 +1027,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
   { /* Positive infinity.  */
     char *result;
     int retval =
-      my_asprintf (&result, "%f %d", 1.0 / 0.0, 33, 44, 55);
+      my_asprintf (&result, "%f %d", Infinityd (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "inf 33") == 0
             || strcmp (result, "infinity 33") == 0);
@@ -1035,7 +1038,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
   { /* Negative infinity.  */
     char *result;
     int retval =
-      my_asprintf (&result, "%f %d", -1.0 / 0.0, 33, 44, 55);
+      my_asprintf (&result, "%f %d", - Infinityd (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "-inf 33") == 0
             || strcmp (result, "-infinity 33") == 0);
@@ -1128,7 +1131,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
   { /* FLAG_ZERO with infinite number.  */
     char *result;
     int retval =
-      my_asprintf (&result, "%015f %d", -1.0 / 0.0, 33, 44, 55);
+      my_asprintf (&result, "%015f %d", - Infinityd (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "           -inf 33") == 0
             || strcmp (result, "      -infinity 33") == 0);
@@ -1323,7 +1326,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
   { /* Positive infinity.  */
     char *result;
     int retval =
-      my_asprintf (&result, "%Lf %d", 1.0L / 0.0L, 33, 44, 55);
+      my_asprintf (&result, "%Lf %d", Infinityl (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "inf 33") == 0
             || strcmp (result, "infinity 33") == 0);
@@ -1334,7 +1337,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
   { /* Negative infinity.  */
     char *result;
     int retval =
-      my_asprintf (&result, "%Lf %d", -1.0L / 0.0L, 33, 44, 55);
+      my_asprintf (&result, "%Lf %d", - Infinityl (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "-inf 33") == 0
             || strcmp (result, "-infinity 33") == 0);
@@ -1353,7 +1356,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
     ASSERT (retval == strlen (result));
     free (result);
   }
-#if CHECK_PRINTF_SAFE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_))
+#if CHECK_PRINTF_SAFE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_)) && !HAVE_SAME_LONG_DOUBLE_AS_DOUBLE
   { /* Quiet NaN.  */
     static union { unsigned int word[4]; long double value; } x =
       { LDBL80_WORDS (0xFFFF, 0xC3333333, 0x00000000) };
@@ -1528,7 +1531,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
   { /* FLAG_ZERO with infinite number.  */
     char *result;
     int retval =
-      my_asprintf (&result, "%015Lf %d", -1.0L / 0.0L, 33, 44, 55);
+      my_asprintf (&result, "%015Lf %d", - Infinityl (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "           -inf 33") == 0
             || strcmp (result, "      -infinity 33") == 0);
@@ -1634,7 +1637,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
   { /* Positive infinity.  */
     char *result;
     int retval =
-      my_asprintf (&result, "%F %d", 1.0 / 0.0, 33, 44, 55);
+      my_asprintf (&result, "%F %d", Infinityd (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "INF 33") == 0
             || strcmp (result, "INFINITY 33") == 0);
@@ -1645,7 +1648,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
   { /* Negative infinity.  */
     char *result;
     int retval =
-      my_asprintf (&result, "%F %d", -1.0 / 0.0, 33, 44, 55);
+      my_asprintf (&result, "%F %d", - Infinityd (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "-INF 33") == 0
             || strcmp (result, "-INFINITY 33") == 0);
@@ -1678,7 +1681,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
   { /* FLAG_ZERO with infinite number.  */
     char *result;
     int retval =
-      my_asprintf (&result, "%015F %d", -1.0 / 0.0, 33, 44, 55);
+      my_asprintf (&result, "%015F %d", - Infinityd (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "           -INF 33") == 0
             || strcmp (result, "      -INFINITY 33") == 0);
@@ -1770,7 +1773,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
   { /* Positive infinity.  */
     char *result;
     int retval =
-      my_asprintf (&result, "%LF %d", 1.0L / 0.0L, 33, 44, 55);
+      my_asprintf (&result, "%LF %d", Infinityl (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "INF 33") == 0
             || strcmp (result, "INFINITY 33") == 0);
@@ -1781,7 +1784,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
   { /* Negative infinity.  */
     char *result;
     int retval =
-      my_asprintf (&result, "%LF %d", -1.0L / 0.0L, 33, 44, 55);
+      my_asprintf (&result, "%LF %d", - Infinityl (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "-INF 33") == 0
             || strcmp (result, "-INFINITY 33") == 0);
@@ -1814,7 +1817,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
   { /* FLAG_ZERO with infinite number.  */
     char *result;
     int retval =
-      my_asprintf (&result, "%015LF %d", -1.0L / 0.0L, 33, 44, 55);
+      my_asprintf (&result, "%015LF %d", - Infinityl (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "           -INF 33") == 0
             || strcmp (result, "      -INFINITY 33") == 0);
@@ -2012,7 +2015,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
   { /* Positive infinity.  */
     char *result;
     int retval =
-      my_asprintf (&result, "%e %d", 1.0 / 0.0, 33, 44, 55);
+      my_asprintf (&result, "%e %d", Infinityd (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "inf 33") == 0
             || strcmp (result, "infinity 33") == 0);
@@ -2023,7 +2026,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
   { /* Negative infinity.  */
     char *result;
     int retval =
-      my_asprintf (&result, "%e %d", -1.0 / 0.0, 33, 44, 55);
+      my_asprintf (&result, "%e %d", - Infinityd (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "-inf 33") == 0
             || strcmp (result, "-infinity 33") == 0);
@@ -2134,7 +2137,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
   { /* FLAG_ZERO with infinite number.  */
     char *result;
     int retval =
-      my_asprintf (&result, "%015e %d", -1.0 / 0.0, 33, 44, 55);
+      my_asprintf (&result, "%015e %d", - Infinityd (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "           -inf 33") == 0
             || strcmp (result, "      -infinity 33") == 0);
@@ -2345,7 +2348,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
   { /* Positive infinity.  */
     char *result;
     int retval =
-      my_asprintf (&result, "%Le %d", 1.0L / 0.0L, 33, 44, 55);
+      my_asprintf (&result, "%Le %d", Infinityl (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "inf 33") == 0
             || strcmp (result, "infinity 33") == 0);
@@ -2356,7 +2359,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
   { /* Negative infinity.  */
     char *result;
     int retval =
-      my_asprintf (&result, "%Le %d", -1.0L / 0.0L, 33, 44, 55);
+      my_asprintf (&result, "%Le %d", - Infinityl (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "-inf 33") == 0
             || strcmp (result, "-infinity 33") == 0);
@@ -2375,7 +2378,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
     ASSERT (retval == strlen (result));
     free (result);
   }
-#if CHECK_PRINTF_SAFE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_))
+#if CHECK_PRINTF_SAFE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_)) && !HAVE_SAME_LONG_DOUBLE_AS_DOUBLE
   { /* Quiet NaN.  */
     static union { unsigned int word[4]; long double value; } x =
       { LDBL80_WORDS (0xFFFF, 0xC3333333, 0x00000000) };
@@ -2568,7 +2571,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
   { /* FLAG_ZERO with infinite number.  */
     char *result;
     int retval =
-      my_asprintf (&result, "%015Le %d", -1.0L / 0.0L, 33, 44, 55);
+      my_asprintf (&result, "%015Le %d", - Infinityl (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "           -inf 33") == 0
             || strcmp (result, "      -infinity 33") == 0);
@@ -2778,7 +2781,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
   { /* Positive infinity.  */
     char *result;
     int retval =
-      my_asprintf (&result, "%g %d", 1.0 / 0.0, 33, 44, 55);
+      my_asprintf (&result, "%g %d", Infinityd (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "inf 33") == 0
             || strcmp (result, "infinity 33") == 0);
@@ -2789,7 +2792,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
   { /* Negative infinity.  */
     char *result;
     int retval =
-      my_asprintf (&result, "%g %d", -1.0 / 0.0, 33, 44, 55);
+      my_asprintf (&result, "%g %d", - Infinityd (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "-inf 33") == 0
             || strcmp (result, "-infinity 33") == 0);
@@ -2893,7 +2896,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
   { /* FLAG_ZERO with infinite number.  */
     char *result;
     int retval =
-      my_asprintf (&result, "%015g %d", -1.0 / 0.0, 33, 44, 55);
+      my_asprintf (&result, "%015g %d", - Infinityd (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "           -inf 33") == 0
             || strcmp (result, "      -infinity 33") == 0);
@@ -3099,7 +3102,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
   { /* Positive infinity.  */
     char *result;
     int retval =
-      my_asprintf (&result, "%Lg %d", 1.0L / 0.0L, 33, 44, 55);
+      my_asprintf (&result, "%Lg %d", Infinityl (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "inf 33") == 0
             || strcmp (result, "infinity 33") == 0);
@@ -3110,7 +3113,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
   { /* Negative infinity.  */
     char *result;
     int retval =
-      my_asprintf (&result, "%Lg %d", -1.0L / 0.0L, 33, 44, 55);
+      my_asprintf (&result, "%Lg %d", - Infinityl (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "-inf 33") == 0
             || strcmp (result, "-infinity 33") == 0);
@@ -3129,7 +3132,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
     ASSERT (retval == strlen (result));
     free (result);
   }
-#if CHECK_PRINTF_SAFE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_))
+#if CHECK_PRINTF_SAFE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_)) && !HAVE_SAME_LONG_DOUBLE_AS_DOUBLE
   { /* Quiet NaN.  */
     static union { unsigned int word[4]; long double value; } x =
       { LDBL80_WORDS (0xFFFF, 0xC3333333, 0x00000000) };
@@ -3315,7 +3318,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
   { /* FLAG_ZERO with infinite number.  */
     char *result;
     int retval =
-      my_asprintf (&result, "%015Lg %d", -1.0L / 0.0L, 33, 44, 55);
+      my_asprintf (&result, "%015Lg %d", - Infinityl (), 33, 44, 55);
     ASSERT (result != NULL);
     ASSERT (strcmp (result, "           -inf 33") == 0
             || strcmp (result, "      -infinity 33") == 0);