Avoid test failures on some versions of HP-UX 11.

1 files changed, 36 insertions, 18 deletions

diff --git a/tests/test-sprintf-posix.h b/tests/test-sprintf-posix.h
index 3df6d128b0..d1afd331a0 100644
--- a/tests/test-sprintf-posix.h
+++ b/tests/test-sprintf-posix.h
@@ -162,7 +162,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...))
     int retval =
       my_sprintf (result, "%a %d", NaN (), 33, 44, 55);
     ASSERT (strlen (result) >= 3 + 3
-	    && memcmp (result, "nan", 3) == 0
+	    && (memcmp (result, "nan", 3) == 0
+		|| memcmp (result, "-nan", 4) == 0)
 	    && strcmp (result + strlen (result) - 3, " 33") == 0);
     ASSERT (retval == strlen (result));
   }
@@ -361,7 +362,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...))
     /* "0000000nan 33" is not a valid result; see
        <http://lists.gnu.org/archive/html/bug-gnulib/2007-04/msg00107.html> */
     ASSERT (strlen (result) == 20 + 3
-	    && memcmp (result + strspn (result, " "), "nan", 3) == 0
+	    && (memcmp (result + strspn (result, " "), "nan", 3) == 0
+		|| memcmp (result + strspn (result, " "), "-nan", 4) == 0)
 	    && strcmp (result + strlen (result) - 3, " 33") == 0);
     ASSERT (retval == strlen (result));
   }
@@ -426,7 +428,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...))
     int retval =
       my_sprintf (result, "%La %d", 0.0L / 0.0L, 33, 44, 55);
     ASSERT (strlen (result) >= 3 + 3
-	    && memcmp (result, "nan", 3) == 0
+	    && (memcmp (result, "nan", 3) == 0
+		|| memcmp (result, "-nan", 4) == 0)
 	    && strcmp (result + strlen (result) - 3, " 33") == 0);
     ASSERT (retval == strlen (result));
   }
@@ -626,7 +629,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...))
     /* "0000000nan 33" is not a valid result; see
        <http://lists.gnu.org/archive/html/bug-gnulib/2007-04/msg00107.html> */
     ASSERT (strlen (result) == 20 + 3
-	    && memcmp (result + strspn (result, " "), "nan", 3) == 0
+	    && (memcmp (result + strspn (result, " "), "nan", 3) == 0
+		|| memcmp (result + strspn (result, " "), "-nan", 4) == 0)
 	    && strcmp (result + strlen (result) - 3, " 33") == 0);
     ASSERT (retval == strlen (result));
   }
@@ -786,7 +790,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...))
     int retval =
       my_sprintf (result, "%f %d", NaN (), 33, 44, 55);
     ASSERT (strlen (result) >= 3 + 3
-	    && memcmp (result, "nan", 3) == 0
+	    && (memcmp (result, "nan", 3) == 0
+		|| memcmp (result, "-nan", 4) == 0)
 	    && strcmp (result + strlen (result) - 3, " 33") == 0);
     ASSERT (retval == strlen (result));
   }
@@ -861,7 +866,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...))
     int retval =
       my_sprintf (result, "%020f %d", NaN (), 33, 44, 55);
     ASSERT (strlen (result) == 20 + 3
-	    && memcmp (result + strspn (result, " "), "nan", 3) == 0
+	    && (memcmp (result + strspn (result, " "), "nan", 3) == 0
+		|| memcmp (result + strspn (result, " "), "-nan", 4) == 0)
 	    && strcmp (result + strlen (result) - 3, " 33") == 0);
     ASSERT (retval == strlen (result));
   }
@@ -1028,7 +1034,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...))
     int retval =
       my_sprintf (result, "%Lf %d", zero / zero, 33, 44, 55);
     ASSERT (strlen (result) >= 3 + 3
-	    && memcmp (result, "nan", 3) == 0
+	    && (memcmp (result, "nan", 3) == 0
+		|| memcmp (result, "-nan", 4) == 0)
 	    && strcmp (result + strlen (result) - 3, " 33") == 0);
     ASSERT (retval == strlen (result));
   }
@@ -1104,7 +1111,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...))
     int retval =
       my_sprintf (result, "%020Lf %d", zero / zero, 33, 44, 55);
     ASSERT (strlen (result) == 20 + 3
-	    && memcmp (result + strspn (result, " "), "nan", 3) == 0
+	    && (memcmp (result + strspn (result, " "), "nan", 3) == 0
+		|| memcmp (result + strspn (result, " "), "-nan", 4) == 0)
 	    && strcmp (result + strlen (result) - 3, " 33") == 0);
     ASSERT (retval == strlen (result));
   }
@@ -1183,7 +1191,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...))
     int retval =
       my_sprintf (result, "%F %d", NaN (), 33, 44, 55);
     ASSERT (strlen (result) >= 3 + 3
-	    && memcmp (result, "NAN", 3) == 0
+	    && (memcmp (result, "NAN", 3) == 0
+		|| memcmp (result, "-NAN", 4) == 0)
 	    && strcmp (result + strlen (result) - 3, " 33") == 0);
     ASSERT (retval == strlen (result));
   }
@@ -1278,7 +1287,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...))
     int retval =
       my_sprintf (result, "%LF %d", zero / zero, 33, 44, 55);
     ASSERT (strlen (result) >= 3 + 3
-	    && memcmp (result, "NAN", 3) == 0
+	    && (memcmp (result, "NAN", 3) == 0
+		|| memcmp (result, "-NAN", 4) == 0)
 	    && strcmp (result + strlen (result) - 3, " 33") == 0);
     ASSERT (retval == strlen (result));
   }
@@ -1477,7 +1487,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...))
     int retval =
       my_sprintf (result, "%e %d", NaN (), 33, 44, 55);
     ASSERT (strlen (result) >= 3 + 3
-	    && memcmp (result, "nan", 3) == 0
+	    && (memcmp (result, "nan", 3) == 0
+		|| memcmp (result, "-nan", 4) == 0)
 	    && strcmp (result + strlen (result) - 3, " 33") == 0);
     ASSERT (retval == strlen (result));
   }
@@ -1568,7 +1579,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...))
     int retval =
       my_sprintf (result, "%020e %d", NaN (), 33, 44, 55);
     ASSERT (strlen (result) == 20 + 3
-	    && memcmp (result + strspn (result, " "), "nan", 3) == 0
+	    && (memcmp (result + strspn (result, " "), "nan", 3) == 0
+		|| memcmp (result + strspn (result, " "), "-nan", 4) == 0)
 	    && strcmp (result + strlen (result) - 3, " 33") == 0);
     ASSERT (retval == strlen (result));
   }
@@ -1736,7 +1748,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...))
     int retval =
       my_sprintf (result, "%Le %d", zero / zero, 33, 44, 55);
     ASSERT (strlen (result) >= 3 + 3
-	    && memcmp (result, "nan", 3) == 0
+	    && (memcmp (result, "nan", 3) == 0
+		|| memcmp (result, "-nan", 4) == 0)
 	    && strcmp (result + strlen (result) - 3, " 33") == 0);
     ASSERT (retval == strlen (result));
   }
@@ -1820,7 +1833,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...))
     int retval =
       my_sprintf (result, "%020Le %d", zero / zero, 33, 44, 55);
     ASSERT (strlen (result) == 20 + 3
-	    && memcmp (result + strspn (result, " "), "nan", 3) == 0
+	    && (memcmp (result + strspn (result, " "), "nan", 3) == 0
+		|| memcmp (result + strspn (result, " "), "-nan", 4) == 0)
 	    && strcmp (result + strlen (result) - 3, " 33") == 0);
     ASSERT (retval == strlen (result));
   }
@@ -1998,7 +2012,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...))
     int retval =
       my_sprintf (result, "%g %d", NaN (), 33, 44, 55);
     ASSERT (strlen (result) >= 3 + 3
-	    && memcmp (result, "nan", 3) == 0
+	    && (memcmp (result, "nan", 3) == 0
+		|| memcmp (result, "-nan", 4) == 0)
 	    && strcmp (result + strlen (result) - 3, " 33") == 0);
     ASSERT (retval == strlen (result));
   }
@@ -2082,7 +2097,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...))
     int retval =
       my_sprintf (result, "%020g %d", NaN (), 33, 44, 55);
     ASSERT (strlen (result) == 20 + 3
-	    && memcmp (result + strspn (result, " "), "nan", 3) == 0
+	    && (memcmp (result + strspn (result, " "), "nan", 3) == 0
+		|| memcmp (result + strspn (result, " "), "-nan", 4) == 0)
 	    && strcmp (result + strlen (result) - 3, " 33") == 0);
     ASSERT (retval == strlen (result));
   }
@@ -2250,7 +2266,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...))
     int retval =
       my_sprintf (result, "%Lg %d", zero / zero, 33, 44, 55);
     ASSERT (strlen (result) >= 3 + 3
-	    && memcmp (result, "nan", 3) == 0
+	    && (memcmp (result, "nan", 3) == 0
+		|| memcmp (result, "-nan", 4) == 0)
 	    && strcmp (result + strlen (result) - 3, " 33") == 0);
     ASSERT (retval == strlen (result));
   }
@@ -2334,7 +2351,8 @@ test_function (int (*my_sprintf) (char *, const char *, ...))
     int retval =
       my_sprintf (result, "%020Lg %d", zero / zero, 33, 44, 55);
     ASSERT (strlen (result) == 20 + 3
-	    && memcmp (result + strspn (result, " "), "nan", 3) == 0
+	    && (memcmp (result + strspn (result, " "), "nan", 3) == 0
+		|| memcmp (result + strspn (result, " "), "-nan", 4) == 0)
 	    && strcmp (result + strlen (result) - 3, " 33") == 0);
     ASSERT (retval == strlen (result));
   }