diff options
| author | Andreas Schwab <schwab@suse.de> | 2018-10-16 17:45:02 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@suse.de> | 2018-10-17 09:34:13 +0200 |
| commit | ce5a7de6cd1479a1e78fda0db023bd4effa072a4 (patch) | |
| tree | 546309c1ea2b6be9f7029736585d20e9811bb3f5 | |
| parent | f0da0bcf8b270d08c172df42dfc3f2b9a9240973 (diff) | |
| download | glibc-ce5a7de6cd1479a1e78fda0db023bd4effa072a4.zip glibc-ce5a7de6cd1479a1e78fda0db023bd4effa072a4.tar.gz glibc-ce5a7de6cd1479a1e78fda0db023bd4effa072a4.tar.bz2 | |
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.
62 files changed, 64 insertions, 91 deletions
@@ -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 e66f31a..1b74e63 100644 --- 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 3e57cdd..8c0ad47 100644 --- 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 357f0d8..58aec07 100644 --- 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 89bdca9..6321af1 100644 --- 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 52120e9..3c13f3a 100644 --- 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 31ca59f..3e131ee 100644 --- 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 3ac4a90..ccd44f2 100644 --- 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 e407c51..44ea176 100644 --- 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 bc51420..b3e2204 100644 --- 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 c724d8a..1067634 100644 --- 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 1708430..2b80fca 100644 --- 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 c98731f..e5b3cb0 100644 --- 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 eebc8ac..faa56c8 100644 --- 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 fbd2ffd..d7ff9af 100644 --- 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 8167042..8148401 100644 --- 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 9fd2c49..a1ef22b 100644 --- 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 ff676a8..af74c9e 100644 --- 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 682c131..4afb0d5 100644 --- 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 fec233c..4af3570 100644 --- 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 03150b5..d8f30c6 100644 --- 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 f0fbd37..bd938b6 100644 --- 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 6bf968f..506382f 100644 --- 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 e86eb02..17aa32b 100644 --- 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 08c3d8d..e7951e5 100644 --- 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 397853b..982007a 100644 --- 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 9c63625..f6969a4 100644 --- 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 1d6ba17..befc14f 100644 --- 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 f11a55f..8d3d097 100644 --- 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 426b968..18a1a21 100644 --- 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 c566d38..9c7cbf7 100644 --- 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 16a7406..c51df51 100644 --- 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 5b23a17..99fe7aa 100644 --- 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 8968bd4..54212b2 100644 --- 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 70f9515..d66033f 100644 --- 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 611a007..a8cb3e9 100644 --- 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 dc9e423..3784f27 100644 --- 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 f36121e..60794b7 100644 --- 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 9e7f020..5e2b2b6 100644 --- 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 5e624cb..6fb532e 100644 --- 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 4af8761..5a8e949 100644 --- 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 f3b51d2..7d864d2 100644 --- 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 6e8f7b7..ebd0193 100644 --- 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 a86496b..8b8823b 100644 --- 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 20182a2..8b51e4d 100644 --- 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 886b2d8..37bc323 100644 --- 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 f572fad..d58b726 100644 --- 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 e0df6b0..69a3822 100644 --- 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 eab4f68..c13d9f7 100644 --- 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 bec76d0..61417c4 100644 --- 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 f6d76e3..b2b2f27 100644 --- 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 f57cfb4a..119e67b 100644 --- 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 bc15e29..3e49a9e 100644 --- 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 4910755..ed41764 100644 --- 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 e96d7c3..377998e 100644 --- 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 80e3051..5989a4a 100644 --- 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 9d5f746..5372be0 100644 --- 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 cf53aa4..60b5528 100644 --- 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 f5168f8..4c8237c 100644 --- 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 bc4b1f9..be3fea6 100644 --- 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 74e6d1c..7753d38 100644 --- 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 744c583..e7b5eab 100644 --- 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" |