Imported Debian patch 0.9.6+really0.9.3-0.1debian/0.9.6+really0.9.3-0.1

1 files changed, 4 insertions, 22 deletions

diff --git a/tests/test-strerror.c b/tests/test-strerror.c
index 755ffba..11ab7e3 100644
--- a/tests/test-strerror.c
+++ b/tests/test-strerror.c
@@ -1,5 +1,5 @@
 /* Test of strerror() function.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 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
@@ -12,7 +12,8 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Eric Blake <ebb9@byu.net>, 2007.  */
 
@@ -32,44 +33,25 @@ main (void)
 {
   char *str;
 
-  errno = 0;
   str = strerror (EACCES);
   ASSERT (str);
   ASSERT (*str);
-  ASSERT (errno == 0);
 
-  errno = 0;
   str = strerror (ETIMEDOUT);
   ASSERT (str);
   ASSERT (*str);
-  ASSERT (errno == 0);
 
-  errno = 0;
   str = strerror (EOVERFLOW);
   ASSERT (str);
   ASSERT (*str);
-  ASSERT (errno == 0);
 
-  /* 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 (strstr (str, "nknown") == NULL);
-  ASSERT (strstr (str, "ndefined") == NULL);
-
-  /* POSIX requires strerror to produce a non-NULL result for all
-     inputs; as an extension, we also guarantee a non-empty result.
-     Reporting EINVAL is optional.  */
-  errno = 0;
+
   str = strerror (-3);
   ASSERT (str);
   ASSERT (*str);
-  ASSERT (errno == 0 || errno == EINVAL);
 
   return 0;
 }