usleep() is no longer used.

5 files changed, 2 insertions, 55 deletions

diff --git a/gl/tests/Makefile.am b/gl/tests/Makefile.am
index e7f83f31b5..772c9f9d4d 100644
--- a/gl/tests/Makefile.am
+++ b/gl/tests/Makefile.am
@@ -1342,14 +1342,6 @@ EXTRA_DIST += test-unsetenv.c signature.h macros.h
 
 ## end   gnulib module unsetenv-tests
 
-## begin gnulib module usleep-tests
-
-TESTS += test-usleep
-check_PROGRAMS += test-usleep
-EXTRA_DIST += test-usleep.c signature.h macros.h
-
-## end   gnulib module usleep-tests
-
 ## begin gnulib module vasnprintf-tests
 
 TESTS += test-vasnprintf
diff --git a/gl/tests/ignore-value.h b/gl/tests/ignore-value.h
index 92f2fbca92..52919de8f1 100644
--- a/gl/tests/ignore-value.h
+++ b/gl/tests/ignore-value.h
@@ -54,9 +54,4 @@
 #  define ignore_value(x) (({ __typeof__ (x) __x = (x); (void) __x; }))
 # endif
 
-/* ignore_value works for scalars, pointers and aggregates;
-   deprecate ignore_ptr.  */
-static inline void _GL_ATTRIBUTE_DEPRECATED
-ignore_ptr (void *p) { (void) p; } /* deprecated: use ignore_value */
-
 #endif
diff --git a/gl/tests/pipe.c b/gl/tests/pipe.c
index eb05f44b06..e7e4253020 100644
--- a/gl/tests/pipe.c
+++ b/gl/tests/pipe.c
@@ -21,7 +21,7 @@
 #include <unistd.h>
 
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Native Woe32 API.  */
+/* Native Windows API.  */
 
 /* Get _pipe().  */
 # include <io.h>
diff --git a/gl/tests/test-init.sh b/gl/tests/test-init.sh
index 3368a99acc..c644609fe6 100755
--- a/gl/tests/test-init.sh
+++ b/gl/tests/test-init.sh
@@ -63,7 +63,7 @@ EOF
   sed 's/	.*//;/^@@/d' out > k && mv k out
 
   # Compare against expected output only if compare is using diff -u.
-  if (diff -u out out < /dev/null) > /dev/null 2>&1; then
+  if diff -u out out < /dev/null > /dev/null 2>&1; then
     compare exp out || fail=1
   fi
   case $- in *x*) ;; *) test -s err && fail_ "err not empty: $(cat err)";; esac
diff --git a/gl/tests/test-usleep.c b/gl/tests/test-usleep.c
deleted file mode 100644
index 1e4cac1cc2..0000000000
--- a/gl/tests/test-usleep.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Test of usleep() function.
-   Copyright (C) 2009-2012 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
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   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/>.  */
-
-/* Written by Eric Blake <ebb9@byu.net>, 2009.  */
-
-#include <config.h>
-
-#include <unistd.h>
-
-#include "signature.h"
-SIGNATURE_CHECK (usleep, int, (useconds_t));
-
-#include <time.h>
-
-#include "macros.h"
-
-int
-main (void)
-{
-  time_t start = time (NULL);
-  ASSERT (usleep (1000000) == 0);
-  ASSERT (start < time (NULL));
-
-  ASSERT (usleep (0) == 0);
-
-  return 0;
-}