X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-sprintf-posix.h;h=ce87a3a1a9e56e280169f50b957c6f0c45f2363c;hb=8df2459e40ab2ee726f4532c0699d4f7a40717d0;hp=7767c89bcf559921e65e117d7b5c38d38bc02ec7;hpb=48f8accaa33dfce46b63cc225a88d9421e4d2dc8;p=gnulib.git

diff --git a/tests/test-sprintf-posix.h b/tests/test-sprintf-posix.h
index 7767c89bc..ce87a3a1a 100644
--- a/tests/test-sprintf-posix.h
+++ b/tests/test-sprintf-posix.h
@@ -1679,7 +1679,6 @@ test_function (int (*my_sprintf) (char *, const char *, ...))
 	int retval =
 	  my_sprintf (result, "%e", data[k].value);
 	const char *expected = data[k].string;
-	ASSERT (result != NULL);
 	ASSERT (strcmp (result, expected) == 0
 		/* Some implementations produce exponents with 3 digits.  */
 		|| (strlen (result) == strlen (expected) + 1
@@ -1870,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));
   }
 
@@ -1878,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));
   }
 
@@ -1966,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));
       }
   }
@@ -1975,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));
   }
 
@@ -1983,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));
   }
 
@@ -1992,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));
   }
 
@@ -2115,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));
   }
 
@@ -2123,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));
   }
 
@@ -2131,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));
   }
 
@@ -2139,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));
   }
 
@@ -2147,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));
   }
 
@@ -2155,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));
   }
 
@@ -2163,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));
   }
 
@@ -2171,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));
   }
 
@@ -2198,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));
   }
 
@@ -2206,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));
   }
 
@@ -2214,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));
   }
 
@@ -2509,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));
   }
 
@@ -2597,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));
       }
   }
@@ -2794,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));
   }
 
@@ -2829,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));
   }
 
@@ -2914,7 +2949,6 @@ test_function (int (*my_sprintf) (char *, const char *, ...))
     int retval =
       my_sprintf (result, "%.4000d %d", 1234567, 99);
     size_t i;
-    ASSERT (result != NULL);
     for (i = 0; i < 4000 - 7; i++)
       ASSERT (result[i] == '0');
     ASSERT (strcmp (result + 4000 - 7, "1234567 99") == 0);
@@ -2926,7 +2960,6 @@ test_function (int (*my_sprintf) (char *, const char *, ...))
     int retval =
       my_sprintf (result, "%.*d %d", 4000, 1234567, 99);
     size_t i;
-    ASSERT (result != NULL);
     for (i = 0; i < 4000 - 7; i++)
       ASSERT (result[i] == '0');
     ASSERT (strcmp (result + 4000 - 7, "1234567 99") == 0);
@@ -2938,7 +2971,6 @@ test_function (int (*my_sprintf) (char *, const char *, ...))
     int retval =
       my_sprintf (result, "%.4000d %d", -1234567, 99);
     size_t i;
-    ASSERT (result != NULL);
     ASSERT (result[0] == '-');
     for (i = 0; i < 4000 - 7; i++)
       ASSERT (result[1 + i] == '0');
@@ -2951,7 +2983,6 @@ test_function (int (*my_sprintf) (char *, const char *, ...))
     int retval =
       my_sprintf (result, "%.4000u %d", 1234567, 99);
     size_t i;
-    ASSERT (result != NULL);
     for (i = 0; i < 4000 - 7; i++)
       ASSERT (result[i] == '0');
     ASSERT (strcmp (result + 4000 - 7, "1234567 99") == 0);
@@ -2963,7 +2994,6 @@ test_function (int (*my_sprintf) (char *, const char *, ...))
     int retval =
       my_sprintf (result, "%.4000o %d", 1234567, 99);
     size_t i;
-    ASSERT (result != NULL);
     for (i = 0; i < 4000 - 7; i++)
       ASSERT (result[i] == '0');
     ASSERT (strcmp (result + 4000 - 7, "4553207 99") == 0);
@@ -2975,7 +3005,6 @@ test_function (int (*my_sprintf) (char *, const char *, ...))
     int retval =
       my_sprintf (result, "%.4000x %d", 1234567, 99);
     size_t i;
-    ASSERT (result != NULL);
     for (i = 0; i < 4000 - 6; i++)
       ASSERT (result[i] == '0');
     ASSERT (strcmp (result + 4000 - 6, "12d687 99") == 0);
@@ -2987,7 +3016,6 @@ test_function (int (*my_sprintf) (char *, const char *, ...))
     int retval =
       my_sprintf (result, "%#.4000x %d", 1234567, 99);
     size_t i;
-    ASSERT (result != NULL);
     ASSERT (result[0] == '0');
     ASSERT (result[1] == 'x');
     for (i = 0; i < 4000 - 6; i++)
@@ -3006,7 +3034,6 @@ test_function (int (*my_sprintf) (char *, const char *, ...))
       input[i] = 'a' + ((1000000 / (i + 1)) % 26);
     input[i] = '\0';
     retval = my_sprintf (result, "%.4000s %d", input, 99);
-    ASSERT (result != NULL);
     ASSERT (memcmp (result, input, 4000) == 0);
     ASSERT (strcmp (result + 4000, " 99") == 0);
     ASSERT (retval == strlen (result));