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.tar.xz glibc-ce5a7de6cd1479a1e78fda0db023bd4effa072a4.zip | |
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 e66f31a2c7..1b74e63729 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 3e57cdd3b8..8c0ad47faf 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 357f0d8b7e..58aec07dae 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 89bdca9086..6321af1daa 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 52120e9bca..3c13f3a9e3 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 31ca59fec5..3e131eee4c 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 3ac4a90da4..ccd44f2c62 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 e407c519db..44ea176f74 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 bc51420e60..b3e22042ee 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 c724d8ae2d..1067634eb7 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 1708430058..2b80fca0e9 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 c98731fe5d..e5b3cb0029 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 eebc8ac557..faa56c8346 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 fbd2ffd4da..d7ff9af9d8 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 8167042492..8148401a66 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 9fd2c4915c..a1ef22ba25 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); } </ |