Don't reduce test timeout to less than default

This removes all overrides of TIMEOUT that are less than or equal to the
default timeout.

diff --git a/ChangeLog b/ChangeLog
index f3c543aa413ecbce48a95167f5716de98821f57d..4f0bd1e30f219c8fb8a16f984d33109e435d3079 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,67 @@
+2018-10-17  Andreas Schwab  <schwab@suse.de>
+
+       * benchtests/bench-strtod.c (TIMEOUT): Don't define.
+       * crypt/badsalttest.c (TIMEOUT): Likewise.
+       * crypt/sha256c-test.c (TIMEOUT): Likewise.
+       * dirent/tst-fdopendir.c (TIMEOUT): Likewise.
+       * io/test-lfs.c (TIMEOUT): Likewise.
+       * libio/tst-atime.c (TIMEOUT): Likewise.
+       * localedata/tst-leaks.c (TIMEOUT): Likewise.
+       * nptl/tst-cancel19.c (TIMEOUT): Likewise.
+       * nptl/tst-cancel22.c (TIMEOUT): Likewise.
+       * nptl/tst-cancel25.c (TIMEOUT): Likewise.
+       * nptl/tst-cancel7.c (TIMEOUT): Likewise.
+       * nptl/tst-cond-except.c (TIMEOUT): Likewise.
+       * nptl/tst-cond11.c (TIMEOUT): Likewise.
+       * nptl/tst-cond14.c (TIMEOUT): Likewise.
+       * nptl/tst-cond15.c (TIMEOUT): Likewise.
+       * nptl/tst-cond24.c (TIMEOUT): Likewise.
+       * nptl/tst-cond25.c (TIMEOUT): Likewise.
+       * nptl/tst-kill2.c (TIMEOUT): Likewise.
+       * nptl/tst-kill3.c (TIMEOUT): Likewise.
+       * nptl/tst-mutex4.c (TIMEOUT): Likewise.
+       * nptl/tst-mutex5.c (TIMEOUT): Likewise.
+       * nptl/tst-mutex9.c (TIMEOUT): Likewise.
+       * nptl/tst-once2.c (TIMEOUT): Likewise.
+       * nptl/tst-once3.c (TIMEOUT): Likewise.
+       * nptl/tst-once4.c (TIMEOUT): Likewise.
+       * nptl/tst-robust8.c (TIMEOUT): Likewise.
+       * nptl/tst-robust9.c (TIMEOUT): Likewise.
+       * nptl/tst-rwlock16.c (TIMEOUT): Likewise.
+       * nptl/tst-sem14.c (TIMEOUT): Likewise.
+       * nptl/tst-sem6.c (TIMEOUT): Likewise.
+       * nptl/tst-signal3.c (TIMEOUT): Likewise.
+       * nptl/tst-spin4.c (TIMEOUT): Likewise.
+       * nptl/tst-tls3.c (TIMEOUT): Likewise.
+       * nptl/tst-tls4.c (TIMEOUT): Likewise.
+       * posix/tst-chmod.c (TIMEOUT): Likewise.
+       * posix/tst-getaddrinfo4.c (TIMEOUT): Likewise.
+       * posix/tst-getaddrinfo5.c (TIMEOUT): Likewise.
+       * posix/tst-preadwrite-common.c (TIMEOUT): Likewise.
+       * posix/tst-regex2.c (TIMEOUT): Likewise.
+       * posix/tst-waitid.c (TIMEOUT): Likewise.
+       * rt/tst-aio.c (TIMEOUT): Likewise.
+       * rt/tst-aio10.c (TIMEOUT): Likewise.
+       * rt/tst-aio4.c (TIMEOUT): Likewise.
+       * rt/tst-aio5.c (TIMEOUT): Likewise.
+       * rt/tst-aio6.c (TIMEOUT): Likewise.
+       * rt/tst-aio64.c (TIMEOUT): Likewise.
+       * rt/tst-aio7.c (TIMEOUT): Likewise.
+       * rt/tst-aio9.c (TIMEOUT): Likewise.
+       * rt/tst-clock.c (TIMEOUT): Likewise.
+       * rt/tst-cpuclock1.c (TIMEOUT): Likewise.
+       * rt/tst-cpuclock2.c (TIMEOUT): Likewise.
+       * rt/tst-mqueue2.c (TIMEOUT): Likewise.
+       * rt/tst-mqueue4.c (TIMEOUT): Likewise.
+       * rt/tst-mqueue5.c (TIMEOUT): Likewise.
+       * rt/tst-timer4.c (TIMEOUT): Likewise.
+       * stdio-common/tst-fseek.c (TIMEOUT): Likewise.
+       * stdio-common/tst-rndseek.c (TIMEOUT): Likewise.
+       * stdlib/tst-empty-env.c (TIMEOUT): Likewise.
+       * sysdeps/wordsize-64/tst-writev.c (TIMEOUT): Likewise.
+       * time/tst-ftime.c (TIMEOUT): Likewise.
+       * timezone/tst-tzset.c (TIMEOUT): Likewise.
+
 2018-10-16 Anton Youdkevitch <anton.youdkevitch@bell-sw.com>
 
        * sysdeps/aarch64/multiarch/memcpy_thunderx.S: Remove thunderx2 code.

diff --git a/benchtests/bench-strtod.c b/benchtests/bench-strtod.c
index e66f31a2c711e0650ec12b069afaf44615d973dc..1b74e63729837f17d623916cea912fba03201610 100644 (file)
--- a/benchtests/bench-strtod.c
+++ b/benchtests/bench-strtod.c
@@ -114,7 +114,4 @@ do_bench (void)
 
 #define TEST_FUNCTION do_bench ()
 
-/* On slower platforms this test needs more than the default 2 seconds.  */
-#define TIMEOUT 10
-
 #include "../test-skeleton.c"

diff --git a/crypt/badsalttest.c b/crypt/badsalttest.c
index 3e57cdd3b8bacf8f90d7f72254a951622a7ee2c2..8c0ad47faffb995eb11bacd6bc4d329fc688e0ab 100644 (file)
--- a/crypt/badsalttest.c
+++ b/crypt/badsalttest.c
@@ -84,6 +84,5 @@ do_test (void)
   return result;
 }
 
-#define TIMEOUT 5
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"

diff --git a/crypt/sha256c-test.c b/crypt/sha256c-test.c
index 357f0d8b7e5d737909062db089a98307ec363e3b..58aec07daeaf94d4c1bb610fec96bb22662cfaea 100644 (file)
--- a/crypt/sha256c-test.c
+++ b/crypt/sha256c-test.c
@@ -57,6 +57,5 @@ do_test (void)
   return result;
 }
 
-#define TIMEOUT 6
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"

diff --git a/dirent/tst-fdopendir.c b/dirent/tst-fdopendir.c
index 89bdca9086816aecd17741fe4537a3727adef6c8..6321af1daa19964800a439ccdd8564111130bdc0 100644 (file)
--- a/dirent/tst-fdopendir.c
+++ b/dirent/tst-fdopendir.c
@@ -123,6 +123,5 @@ do_test (void)
   return 0;
 }
 
-#define TIMEOUT 6
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"

diff --git a/io/test-lfs.c b/io/test-lfs.c
index 52120e9bca19e675d93d85402bafbd49fdfe4917..3c13f3a9e3e04f9f68ac600178d905f5f1995268 100644 (file)
--- a/io/test-lfs.c
+++ b/io/test-lfs.c
@@ -34,9 +34,6 @@ extern int do_test (int argc, char *argv[]);
 /* We have a preparation function.  */
 #define PREPARE do_prepare
 
-/* We might need a bit longer timeout.  */
-#define TIMEOUT 20 /* sec */
-
 /* This defines the `main' function and some more.  */
 #include <test-skeleton.c>
 

diff --git a/libio/tst-atime.c b/libio/tst-atime.c
index 31ca59fec571bbff55e2d97c486517d5ad415cdb..3e131eee4cb097b4725cd027a6a79eefb3d59e59 100644 (file)
--- a/libio/tst-atime.c
+++ b/libio/tst-atime.c
@@ -10,7 +10,6 @@
 
 static int do_test (void);
 #define TEST_FUNCTION do_test ()
-#define TIMEOUT 5
 #include <test-skeleton.c>
 
 

diff --git a/localedata/tst-leaks.c b/localedata/tst-leaks.c
index 3ac4a90da4421b3a87c7b897e900800d84facc80..ccd44f2c6201488947f21226ba46068403320f8a 100644 (file)
--- a/localedata/tst-leaks.c
+++ b/localedata/tst-leaks.c
@@ -17,6 +17,5 @@ do_test (void)
   return 0;
 }
 
-#define TIMEOUT 5
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"

diff --git a/nptl/tst-cancel19.c b/nptl/tst-cancel19.c
index e407c519dba30facae82804679bca6630183eded..44ea176f74367f6a3f94a004759a77ddf559fdd0 100644 (file)
--- a/nptl/tst-cancel19.c
+++ b/nptl/tst-cancel19.c
@@ -281,6 +281,5 @@ do_test (void)
   return ret;
 }
 
-#define TIMEOUT 20
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"

diff --git a/nptl/tst-cancel22.c b/nptl/tst-cancel22.c
index bc51420e60b5be440e2aa4e036213d8578d7cab7..b3e22042ee826c0757ca557038e2adbb5adb7371 100644 (file)
--- a/nptl/tst-cancel22.c
+++ b/nptl/tst-cancel22.c
@@ -115,6 +115,5 @@ do_test (void)
   return 0;
 }
 
-#define TIMEOUT 5
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"

diff --git a/nptl/tst-cancel25.c b/nptl/tst-cancel25.c
index c724d8ae2d013feb8ba33e620377b27198af2cab..1067634eb7171377e85b5d1d28955ff02db3295b 100644 (file)
--- a/nptl/tst-cancel25.c
+++ b/nptl/tst-cancel25.c
@@ -169,5 +169,4 @@ do_test (void)
 }
 
 #define TEST_FUNCTION do_test ()
-#define TIMEOUT 4
 #include "../test-skeleton.c"

diff --git a/nptl/tst-cancel7.c b/nptl/tst-cancel7.c
index 17084300585b93bbf302c3346e940121d9e3c602..2b80fca0e937d913def0cd58b94961fc91db42f9 100644 (file)
--- a/nptl/tst-cancel7.c
+++ b/nptl/tst-cancel7.c
@@ -205,5 +205,4 @@ cmdline_process (int c)
 #define CMDLINE_PROCESS cmdline_process
 #define CLEANUP_HANDLER do_cleanup
 #define PREPARE do_prepare
-#define TIMEOUT 5
 #include <support/test-driver.c>

diff --git a/nptl/tst-cond-except.c b/nptl/tst-cond-except.c
index c98731fe5d3cc2841f0288548ae5b60d366a330c..e5b3cb002986b0291631bb1538898717d4de5c76 100644 (file)
--- a/nptl/tst-cond-except.c
+++ b/nptl/tst-cond-except.c
@@ -106,5 +106,4 @@ out:
 }
 
 #define TEST_FUNCTION do_test ()
-#define TIMEOUT 5
 #include "../test-skeleton.c"

diff --git a/nptl/tst-cond11.c b/nptl/tst-cond11.c
index eebc8ac557ae091ea870a4d403b5abc97fa8e765..faa56c834699ea62e1343ef1cadab97afd8d4749 100644 (file)
--- a/nptl/tst-cond11.c
+++ b/nptl/tst-cond11.c
@@ -199,6 +199,5 @@ do_test (void)
 #endif
 }
 
-#define TIMEOUT 3
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"

diff --git a/nptl/tst-cond14.c b/nptl/tst-cond14.c
index fbd2ffd4da942bcaca4ec01e7c626fe3c833023f..d7ff9af9d89c9e3122ec9b1391e3385ecab77f26 100644 (file)
--- a/nptl/tst-cond14.c
+++ b/nptl/tst-cond14.c
@@ -113,5 +113,4 @@ do_test (void)
 
 
 #define TEST_FUNCTION do_test ()
-#define TIMEOUT 3
 #include "../test-skeleton.c"

diff --git a/nptl/tst-cond15.c b/nptl/tst-cond15.c
index 81670424925dd48de09f6d93c57a7676c1b4f234..8148401a6670c5fa5281fe8b02f0b0586273d972 100644 (file)
--- a/nptl/tst-cond15.c
+++ b/nptl/tst-cond15.c
@@ -155,5 +155,4 @@ do_test (void)
 
 
 #define TEST_FUNCTION do_test ()
-#define TIMEOUT 6
 #include "../test-skeleton.c"

diff --git a/nptl/tst-cond24.c b/nptl/tst-cond24.c
index 9fd2c4915ca0abfea7b3ed9de7e4a1badf96a5f5..a1ef22ba25046ffee968a9aa0efb01f91a642dee 100644 (file)
--- a/nptl/tst-cond24.c
+++ b/nptl/tst-cond24.c
@@ -244,6 +244,5 @@ do_test (void)
   return do_test_wait (thread_fun_timed);
 }
 
-#define TIMEOUT 20
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"

diff --git a/nptl/tst-cond25.c b/nptl/tst-cond25.c
index ff676a87e0790bd5428db870e8903a0498b39d69..af74c9e91ec339af7847c4ee4545cc33f48f4b3a 100644 (file)
--- a/nptl/tst-cond25.c
+++ b/nptl/tst-cond25.c
@@ -285,5 +285,4 @@ do_test (int argc, char **argv)
   return do_test_wait (timed_waiter);
 }
 
-#define TIMEOUT 5
 #include "../test-skeleton.c"

diff --git a/nptl/tst-kill2.c b/nptl/tst-kill2.c
index 682c13158e43f5d8e5cecd84b5d43df479183b41..4afb0d5d0dc99caabe3ff8ed042f53e95281434c 100644 (file)
--- a/nptl/tst-kill2.c
+++ b/nptl/tst-kill2.c
@@ -133,6 +133,5 @@ do_test (void)
 }
 
 
-#define TIMEOUT 5
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"

diff --git a/nptl/tst-kill3.c b/nptl/tst-kill3.c
index fec233cc584a10ce95d5fae998837354755ff644..4af3570aa5f43c670c83d9ddcce7461c9bd74251 100644 (file)
--- a/nptl/tst-kill3.c
+++ b/nptl/tst-kill3.c
@@ -27,7 +27,6 @@
 
 static int do_test (void);
 
-#define TIMEOUT 5
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"
 

diff --git a/nptl/tst-mutex4.c b/nptl/tst-mutex4.c
index 03150b5a08de8d680b0afc72a1bc15661ee1ea8f..d8f30c6119b2fcec25b3b536c009b5915f0f2280 100644 (file)
--- a/nptl/tst-mutex4.c
+++ b/nptl/tst-mutex4.c
@@ -272,6 +272,5 @@ do_test (void)
   return 0;
 }
 
-#define TIMEOUT 4
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"

diff --git a/nptl/tst-mutex5.c b/nptl/tst-mutex5.c
index f0fbd3797cd94becc3d205b04366491e6fa03c62..bd938b6962de501f4ab578e6de7be8bcd7e12a9f 100644 (file)
--- a/nptl/tst-mutex5.c
+++ b/nptl/tst-mutex5.c
@@ -198,6 +198,5 @@ do_test (void)
   return 0;
 }
 
-#define TIMEOUT 4
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"

diff --git a/nptl/tst-mutex9.c b/nptl/tst-mutex9.c
index 6bf968f0b5015a57af91fb819e3e2fb5d2dc4f00..506382f4a75267b3dac7526aa30f042112671642 100644 (file)
--- a/nptl/tst-mutex9.c
+++ b/nptl/tst-mutex9.c
@@ -197,6 +197,5 @@ do_test (void)
   return 0;
 }
 
-#define TIMEOUT 3
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"

diff --git a/nptl/tst-once2.c b/nptl/tst-once2.c
index e86eb0292048f5b1221bf374eae3ff8d957f11f0..17aa32b5dda80aca5c0bd8483e58d0510e16fe67 100644 (file)
--- a/nptl/tst-once2.c
+++ b/nptl/tst-once2.c
@@ -99,5 +99,4 @@ do_test (void)
 }
 
 #define TEST_FUNCTION do_test ()
-#define TIMEOUT 4
 #include "../test-skeleton.c"

diff --git a/nptl/tst-once3.c b/nptl/tst-once3.c
index 08c3d8d05775aa76bdbf94bc5d4638ddbabfafdb..e7951e5b506cb5d331e9dfb1de5b946ea8e84bb1 100644 (file)
--- a/nptl/tst-once3.c
+++ b/nptl/tst-once3.c
@@ -162,5 +162,4 @@ do_test (void)
 }
 
 #define TEST_FUNCTION do_test ()
-#define TIMEOUT 4
 #include "../test-skeleton.c"

diff --git a/nptl/tst-once4.c b/nptl/tst-once4.c
index 397853b16ef8bea95a76f8320fd8a56b4a0a37f0..982007aaddc9f63c4944e8836be49e91a640d9ff 100644 (file)
--- a/nptl/tst-once4.c
+++ b/nptl/tst-once4.c
@@ -197,5 +197,4 @@ do_test (void)
 }
 
 #define TEST_FUNCTION do_test ()
-#define TIMEOUT 4
 #include "../test-skeleton.c"

diff --git a/nptl/tst-robust8.c b/nptl/tst-robust8.c
index 9c636250d4cb0bcd6d802910e8f9ea31568bb73f..f6969a4b847e85736b713d187a4894336bfbbbf0 100644 (file)
--- a/nptl/tst-robust8.c
+++ b/nptl/tst-robust8.c
@@ -15,7 +15,6 @@ static void prepare (void);
 #define PREPARE(argc, argv) prepare ()
 static int do_test (void);
 #define TEST_FUNCTION do_test ()
-#define TIMEOUT 5
 #include "../test-skeleton.c"
 
 

diff --git a/nptl/tst-robust9.c b/nptl/tst-robust9.c
index 1d6ba179be9ebf0d4b9ff1c6327a91909d10c473..befc14f2d82ba15a7d98c30f6d504a61430e4805 100644 (file)
--- a/nptl/tst-robust9.c
+++ b/nptl/tst-robust9.c
@@ -89,6 +89,5 @@ do_test (void)
   return 0;
 }
 
-#define TIMEOUT 5
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"

diff --git a/nptl/tst-rwlock16.c b/nptl/tst-rwlock16.c
index f11a55fc18a69766f6ff3a8f0235a3f3fbfa5ae3..8d3d09788085e4caa4e02ce5b222ae700fd9dd03 100644 (file)
--- a/nptl/tst-rwlock16.c
+++ b/nptl/tst-rwlock16.c
@@ -178,6 +178,5 @@ do_test (void)
 }
 
 
-#define TIMEOUT 3
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"

diff --git a/nptl/tst-sem14.c b/nptl/tst-sem14.c
index 426b968c4e8cc62735ce009daa8d870d3dfb7e8c..18a1a21785f942b857e1b347916d8b861b966748 100644 (file)
--- a/nptl/tst-sem14.c
+++ b/nptl/tst-sem14.c
@@ -87,6 +87,5 @@ do_test (void)
   return thread_fail;
 }
 
-#define TIMEOUT 10
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"

diff --git a/nptl/tst-sem6.c b/nptl/tst-sem6.c
index c566d38d7cb26499be7fb30bb50d676b31442d9c..9c7cbf71a280868bb53e35b27e49ec0a5543dfdc 100644 (file)
--- a/nptl/tst-sem6.c
+++ b/nptl/tst-sem6.c
@@ -75,6 +75,5 @@ do_test (void)
   return 0;
 }
 
-#define TIMEOUT 3
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"

diff --git a/nptl/tst-signal3.c b/nptl/tst-signal3.c
index 16a74065342b87d7a59730f04a3c1256bb5a350a..c51df5156a0f3c0c349c644d00fd171760dcba95 100644 (file)
--- a/nptl/tst-signal3.c
+++ b/nptl/tst-signal3.c
@@ -256,7 +256,6 @@ do_test (void)
   return result;
 }
 
-# define TIMEOUT 10
 # define TEST_FUNCTION do_test ()
 
 #else

diff --git a/nptl/tst-spin4.c b/nptl/tst-spin4.c
index 5b23a172cad46cab551bb713086ccec72a8c398b..99fe7aa6aa27afc958232a30a33977cb94fceda1 100644 (file)
--- a/nptl/tst-spin4.c
+++ b/nptl/tst-spin4.c
@@ -104,6 +104,5 @@ do_test (void)
   return 0;
 }
 
-#define TIMEOUT 5
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"

diff --git a/nptl/tst-tls3.c b/nptl/tst-tls3.c
index 8968bd475320c2efd484e4a6fd1bc69f54df5bb7..54212b2199e4aee115a0101e8987d22728da39e4 100644 (file)
--- a/nptl/tst-tls3.c
+++ b/nptl/tst-tls3.c
@@ -41,7 +41,6 @@ static pthread_t th[N];
 
 static int do_test (void);
 
-#define TIMEOUT 5
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"
 

diff --git a/nptl/tst-tls4.c b/nptl/tst-tls4.c
index 70f9515a0c7e0611e1832cd161accaddf1e378bb..d66033f000ac1a96cb33433a36c23075a06e770d 100644 (file)
--- a/nptl/tst-tls4.c
+++ b/nptl/tst-tls4.c
@@ -176,6 +176,5 @@ do_test (void)
   return 0;
 }
 
-#define TIMEOUT 5
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"

diff --git a/posix/tst-chmod.c b/posix/tst-chmod.c
index 611a007822e50bfc41e3ba13195bd7ba59d39c54..a8cb3e9f43c815111ce77653f98cd68734d66dc3 100644 (file)
--- a/posix/tst-chmod.c
+++ b/posix/tst-chmod.c
@@ -369,9 +369,4 @@ do_test (int argc, char *argv[])
   return result;
 }
 
-
-/* We need a few seconds since we have a few sleeps in the code.  */
-#define TIMEOUT        20
-
-
 #include "../test-skeleton.c"

diff --git a/posix/tst-getaddrinfo4.c b/posix/tst-getaddrinfo4.c
index dc9e423448afedda1343c743055ad2119d28a03c..3784f27e1a906081ab588a1852f22bacef854e20 100644 (file)
--- a/posix/tst-getaddrinfo4.c
+++ b/posix/tst-getaddrinfo4.c
@@ -64,5 +64,4 @@ do_test (void)
 }
 
 #define TEST_FUNCTION do_test ()
-#define TIMEOUT 10
 #include "../test-skeleton.c"

diff --git a/posix/tst-getaddrinfo5.c b/posix/tst-getaddrinfo5.c
index f36121e87cb7fc596db52b4cae6043ef4f3003da..60794b715a909e49b62cc9b50ded47cc2d279f10 100644 (file)
--- a/posix/tst-getaddrinfo5.c
+++ b/posix/tst-getaddrinfo5.c
@@ -66,5 +66,4 @@ test (void)
 }
 
 #define TEST_FUNCTION test ()
-#define TIMEOUT 10
 #include "../test-skeleton.c"

diff --git a/posix/tst-preadwrite-common.c b/posix/tst-preadwrite-common.c
index 9e7f020ff01fade2f293463320efe2c0b708c77b..5e2b2b6ae94a748437624a6e694aead8de1692d4 100644 (file)
--- a/posix/tst-preadwrite-common.c
+++ b/posix/tst-preadwrite-common.c
@@ -27,9 +27,6 @@ static void do_prepare (void);
 static int do_test (void);
 #define TEST_FUNCTION          do_test ()
 
-/* We might need a bit longer timeout.  */
-#define TIMEOUT 20 /* sec */
-
 /* This defines the `main' function and some more.  */
 #include <test-skeleton.c>
 

diff --git a/posix/tst-regex2.c b/posix/tst-regex2.c
index 5e624cb5c2c3e5b54540bd046d1dfc37ae68aa2e..6fb532e7840bbf4b375f36631fd36ebec5cc5191 100644 (file)
--- a/posix/tst-regex2.c
+++ b/posix/tst-regex2.c
@@ -244,6 +244,5 @@ do_test (void)
   return 0;
 }
 
-#define TIMEOUT 20
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"

diff --git a/posix/tst-waitid.c b/posix/tst-waitid.c
index 4af8761afcb90a46b3ad89a73cc5f91eb2a3edd9..5a8e9498f60c6747b00c47affc3f92432ce19310 100644 (file)
--- a/posix/tst-waitid.c
+++ b/posix/tst-waitid.c
@@ -23,8 +23,6 @@
 #include <sys/wait.h>
 #include <signal.h>
 
-#define TIMEOUT 15
-
 static void
 test_child (void)
 {

diff --git a/rt/tst-aio.c b/rt/tst-aio.c
index f3b51d2183d3ca7a816dbac3244a7fc39789f16d..7d864d2aaafe4e0cf2003b3fe212cf28f345f592 100644 (file)
--- a/rt/tst-aio.c
+++ b/rt/tst-aio.c
@@ -34,9 +34,6 @@ extern int do_test (int argc, char *argv[]);
 /* We have a preparation function.  */
 #define PREPARE do_prepare
 
-/* We might need a bit longer timeout.  */
-#define TIMEOUT 20 /* sec */
-
 /* This defines the `main' function and some more.  */
 #include <test-skeleton.c>
 

diff --git a/rt/tst-aio10.c b/rt/tst-aio10.c
index 6e8f7b78c03d893b6223cd6fa65e670c7dd2f155..ebd0193b3c653221468869177ef1f8759ff9cafe 100644 (file)
--- a/rt/tst-aio10.c
+++ b/rt/tst-aio10.c
@@ -115,5 +115,4 @@ do_test (void)
 }
 
 #define TEST_FUNCTION do_test ()
-#define TIMEOUT 5
 #include "../test-skeleton.c"

diff --git a/rt/tst-aio4.c b/rt/tst-aio4.c
index a86496b432ba6835ee0f367740deddc4d3eb7445..8b8823ba8578e95c5cbbcc9bd538eef94e55cd40 100644 (file)
--- a/rt/tst-aio4.c
+++ b/rt/tst-aio4.c
@@ -23,9 +23,6 @@
 #include <unistd.h>
 #include <errno.h>
 
-/* We might need a bit longer timeout.  */
-#define TIMEOUT 10 /* sec */
-
 int my_signo;
 
 volatile sig_atomic_t flag;

diff --git a/rt/tst-aio5.c b/rt/tst-aio5.c
index 20182a205cfacb2b1581b890b4be6b34b55603b9..8b51e4dd382748b9a7a5a68afd5ceedde4269028 100644 (file)
--- a/rt/tst-aio5.c
+++ b/rt/tst-aio5.c
@@ -23,9 +23,6 @@
 #include <unistd.h>
 #include <errno.h>
 
-/* We might need a bit longer timeout.  */
-#define TIMEOUT 10 /* sec */
-
 #define MY_SIVAL 27
 
 volatile sig_atomic_t flag;

diff --git a/rt/tst-aio6.c b/rt/tst-aio6.c
index 886b2d81c3726fcba6b51e9cc9549af110c30023..37bc32325aaa079aa2cc2f799089ebd8bfc01158 100644 (file)
--- a/rt/tst-aio6.c
+++ b/rt/tst-aio6.c
@@ -23,10 +23,6 @@
 #include <sys/time.h>
 
 
-/* We expect to wait for 3 seconds so we have to increase the timeout.  */
-#define TIMEOUT 10 /* sec */
-
-
 #define TEST_FUNCTION do_test ()
 static int
 do_test (void)

diff --git a/rt/tst-aio64.c b/rt/tst-aio64.c
index f572fad1dc6fc1b30cc7c12bc9b6d33132545c74..d58b7266e5e8d4788d6c5c619be211cf4a813552 100644 (file)
--- a/rt/tst-aio64.c
+++ b/rt/tst-aio64.c
@@ -35,9 +35,6 @@ extern int do_test (int argc, char *argv[]);
 /* We have a preparation function.  */
 #define PREPARE do_prepare
 
-/* We might need a bit longer timeout.  */
-#define TIMEOUT 20 /* sec */
-
 /* This defines the `main' function and some more.  */
 #include <test-skeleton.c>
 

diff --git a/rt/tst-aio7.c b/rt/tst-aio7.c
index e0df6b0aaca1ea638ab3fd7eb675169cfead3bdd..69a3822f443a2f02609ef84bf65d2d1c69f48b75 100644 (file)
--- a/rt/tst-aio7.c
+++ b/rt/tst-aio7.c
@@ -25,10 +25,6 @@
 #include <unistd.h>
 
 
-/* We might wait for 3 seconds, so increase timeout to 10 seconds.  */
-#define TIMEOUT 10
-
-
 #define TEST_FUNCTION do_test ()
 static int
 do_test (void)

diff --git a/rt/tst-aio9.c b/rt/tst-aio9.c
index eab4f6859a6cce15ff9e4e41b38d3cc2a02e7508..c13d9f7e727f564696e7998b3de016ca71770c73 100644 (file)
--- a/rt/tst-aio9.c
+++ b/rt/tst-aio9.c
@@ -120,5 +120,4 @@ do_test (void)
 }
 
 #define TEST_FUNCTION do_test ()
-#define TIMEOUT 5
 #include "../test-skeleton.c"

diff --git a/rt/tst-clock.c b/rt/tst-clock.c
index bec76d015299a6ad901f970e7b5efb43c210c5ff..61417c4025f222c79813477551f3be71bbff9709 100644 (file)
--- a/rt/tst-clock.c
+++ b/rt/tst-clock.c
@@ -26,9 +26,6 @@
 /* We want to see output immediately.  */
 #define STDOUT_UNBUFFERED
 
-/* We expect to run at least 10 seconds.  */
-#define TIMEOUT 15
-
 static int
 clock_test (clockid_t cl)
 {

diff --git a/rt/tst-cpuclock1.c b/rt/tst-cpuclock1.c
index f6d76e36147ec771927484c7e15bcc3031487cf4..b2b2f27ad16361691cfe69223188640eb239ebc9 100644 (file)
--- a/rt/tst-cpuclock1.c
+++ b/rt/tst-cpuclock1.c
@@ -316,6 +316,5 @@ do_test (void)
 }
 
 
-#define TIMEOUT 5
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"

diff --git a/rt/tst-cpuclock2.c b/rt/tst-cpuclock2.c
index f57cfb4a0c03f5fdfda7ffa282fa7ea2e36f060c..119e67b916f8962572f1cd349c09e07f2821343b 100644 (file)
--- a/rt/tst-cpuclock2.c
+++ b/rt/tst-cpuclock2.c
@@ -330,7 +330,6 @@ do_test (void)
 
   return result;
 }
-# define TIMEOUT 8
 # define TEST_FUNCTION do_test ()
 #endif
 

diff --git a/rt/tst-mqueue2.c b/rt/tst-mqueue2.c
index bc15e2907fca48790a9a390373ab27e3b07eead3..3e49a9e160609695bd80681c49a1c93f9815ef7c 100644 (file)
--- a/rt/tst-mqueue2.c
+++ b/rt/tst-mqueue2.c
@@ -35,7 +35,6 @@ alrm_handler (int sig)
 {
 }
 
-#define TIMEOUT 10
 #define TEST_FUNCTION do_test ()
 static int
 do_test (void)

diff --git a/rt/tst-mqueue4.c b/rt/tst-mqueue4.c
index 49107556431976440647300cc5f6af07b2d32bcd..ed4176409ca283639ed7fbe5a823c6e2095deebb 100644 (file)
--- a/rt/tst-mqueue4.c
+++ b/rt/tst-mqueue4.c
@@ -32,7 +32,6 @@
 #include <unistd.h>
 #include "tst-mqueue.h"
 
-#define TIMEOUT 4
 #define TEST_FUNCTION do_test ()
 static int
 do_test (void)

diff --git a/rt/tst-mqueue5.c b/rt/tst-mqueue5.c
index e96d7c3dc5e1dbd337f5628c4b08571105b1ee13..377998ecc8e6ce814aba65b5a3df76a8cf28887d 100644 (file)
--- a/rt/tst-mqueue5.c
+++ b/rt/tst-mqueue5.c
@@ -33,8 +33,6 @@
 #include <unistd.h>
 #include "tst-mqueue.h"
 
-#define TIMEOUT 3
-
 #if _POSIX_THREADS && defined SIGRTMIN && defined SA_SIGINFO
 # include <pthread.h>
 

diff --git a/rt/tst-timer4.c b/rt/tst-timer4.c
index 80e30513795bd0966101f67eb02a764585070dce..5989a4a74f7ee1cfdfe0923ef9c0d9d483211ab6 100644 (file)
--- a/rt/tst-timer4.c
+++ b/rt/tst-timer4.c
@@ -178,7 +178,6 @@ check_ts (const char *name, const struct timespec *start,
     return 0;
 }
 
-#define TIMEOUT 15
 #define TEST_FUNCTION do_test ()
 static int
 do_test (void)

diff --git a/stdio-common/tst-fseek.c b/stdio-common/tst-fseek.c
index 9d5f7466f6261913ddb59e9320665a0616502d68..5372be0bc4fa65ca9e429121a71b3eff2baac06f 100644 (file)
--- a/stdio-common/tst-fseek.c
+++ b/stdio-common/tst-fseek.c
@@ -477,6 +477,5 @@ do_test (void)
   return result;
 }
 
-#define TIMEOUT 3
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"

diff --git a/stdio-common/tst-rndseek.c b/stdio-common/tst-rndseek.c
index cf53aa48e0a1585f96c69a47cf6d1d70b184e24c..60b55284296d0de552c96cc2d7c6c5bc88d5c89c 100644 (file)
--- a/stdio-common/tst-rndseek.c
+++ b/stdio-common/tst-rndseek.c
@@ -10,7 +10,6 @@ static char tempdata[65 * 1024];
 
 static int do_test (void);
 #define TEST_FUNCTION do_test ()
-#define TIMEOUT 10
 
 #include "../test-skeleton.c"
 

diff --git a/stdlib/tst-empty-env.c b/stdlib/tst-empty-env.c
index f5168f898eed7fd5461701f4cfed7c451f31cfdb..4c8237c9dad75e4c01eeffe8900b90c45f13c297 100644 (file)
--- a/stdlib/tst-empty-env.c
+++ b/stdlib/tst-empty-env.c
@@ -53,6 +53,5 @@ do_test (int argc, char **argv)
   return 1;
 }
 
-#define TIMEOUT 3
 #define TEST_FUNCTION_ARGV do_test
 #include <support/test-driver.c>

diff --git a/sysdeps/wordsize-64/tst-writev.c b/sysdeps/wordsize-64/tst-writev.c
index bc4b1f95b281e793f248f7e2d8c1b37a05480ac9..be3fea60ce6c496fdd7323db0e8d1a9366e1ea2a 100644 (file)
--- a/sysdeps/wordsize-64/tst-writev.c
+++ b/sysdeps/wordsize-64/tst-writev.c
@@ -110,8 +110,5 @@ do_test (void)
   return 0;
 }
 
-/* Time enough for a large writev syscall to complete.  */
-#define TIMEOUT 20
-
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"

diff --git a/time/tst-ftime.c b/time/tst-ftime.c
index 74e6d1cea33640d1922a1df2f96f5a6a766eeef9..7753d385ed61df296ae4bab18730a99c3ee6fb9c 100644 (file)
--- a/time/tst-ftime.c
+++ b/time/tst-ftime.c
@@ -54,6 +54,5 @@ do_test (void)
   return 0;
 }
 
-#define TIMEOUT 3
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"

diff --git a/timezone/tst-tzset.c b/timezone/tst-tzset.c
index 744c583f7ed25ab28763ecd019afef6541150d95..e7b5eab2cc539a7a7e89696a71ea6443591beded 100644 (file)
--- a/timezone/tst-tzset.c
+++ b/timezone/tst-tzset.c
@@ -26,7 +26,6 @@
 #include <unistd.h>
 #include <support/check.h>
 
-#define TIMEOUT 5
 static int do_test (void);
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"