strerror: relax test for Solaris

Solaris returns "Error 0" for 0 vs. "Unknown error" for -1; while that
does not quite have the positive connotation that POSIX recommends, it
is distinct enough that we do not need to replace the native strerror
just to pick a better string.

The test is really trying to reject implementations that use the same
string for both 0 and 1 (modulo any %d output of the error number).

* tests/test-strerror.c (main): Permit Solaris behavior.
* tests/test-strerror_r.c (main): Likewise.

Signed-off-by: Eric Blake <eblake@redhat.com>

3 files changed, 10 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 8c1200c75c..b90c116139 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-05-19  Eric Blake  <eblake@redhat.com>
 
+	strerror: relax test for Solaris
+	* tests/test-strerror.c (main): Permit Solaris behavior.
+	* tests/test-strerror_r.c (main): Likewise.
+
 	strerror: enforce POSIX ruling on strerror(0)
 	* m4/strerror.m4 (gl_FUNC_STRERROR_SEPARATE): Expose BSD bug.
 	* m4/strerror_r.m4 (gl_FUNC_STRERROR_R): Likewise.
diff --git a/tests/test-strerror.c b/tests/test-strerror.c
index 46d339e64c..03637d7850 100644
--- a/tests/test-strerror.c
+++ b/tests/test-strerror.c
@@ -51,15 +51,15 @@ main (void)
   ASSERT (*str);
   ASSERT (errno == 0);
 
-  /* POSIX requires strerror (0) to succeed; use of "Unknown error" or
-     "error 0" does not count as success, but "No error" works.
+  /* POSIX requires strerror (0) to succeed.  Reject use of "Unknown
+     error", but allow "Success", "No error", or even Solaris' "Error
+     0" which are distinct patterns from true out-of-range strings.
      http://austingroupbugs.net/view.php?id=382  */
   errno = 0;
   str = strerror (0);
   ASSERT (str);
   ASSERT (*str);
   ASSERT (errno == 0);
-  ASSERT (strchr (str, '0') == NULL);
   ASSERT (strstr (str, "nknown") == NULL);
 
   /* POSIX requires strerror to produce a non-NULL result for all
diff --git a/tests/test-strerror_r.c b/tests/test-strerror_r.c
index 0661bdfc76..7aad3c7365 100644
--- a/tests/test-strerror_r.c
+++ b/tests/test-strerror_r.c
@@ -46,14 +46,14 @@ main (void)
   ASSERT (strerror_r (EOVERFLOW, buf, sizeof (buf)) == 0);
   ASSERT (buf[0] != '\0');
 
-  /* POSIX requires strerror (0) to succeed; use of "Unknown error" or
-     "error 0" does not count as success, but "No error" works.
+  /* POSIX requires strerror (0) to succeed.  Reject use of "Unknown
+     error", but allow "Success", "No error", or even Solaris' "Error
+     0" which are distinct patterns from true out-of-range strings.
      http://austingroupbugs.net/view.php?id=382  */
   buf[0] = '\0';
   ret = strerror_r (0, buf, sizeof (buf));
   ASSERT (ret == 0);
   ASSERT (buf[0]);
-  ASSERT (strchr (buf, '0') == NULL);
   ASSERT (strstr (buf, "nknown") == NULL);
 
   /* Test results with out-of-range errnum and enough room.  */