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.
This commit is contained in:
Andreas Schwab 2018-10-16 17:45:02 +02:00
parent f0da0bcf8b
commit ce5a7de6cd
62 changed files with 64 additions and 91 deletions

View File

@ -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> 2018-10-16 Anton Youdkevitch <anton.youdkevitch@bell-sw.com>
* sysdeps/aarch64/multiarch/memcpy_thunderx.S: Remove thunderx2 code. * sysdeps/aarch64/multiarch/memcpy_thunderx.S: Remove thunderx2 code.

View File

@ -114,7 +114,4 @@ do_bench (void)
#define TEST_FUNCTION do_bench () #define TEST_FUNCTION do_bench ()
/* On slower platforms this test needs more than the default 2 seconds. */
#define TIMEOUT 10
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -84,6 +84,5 @@ do_test (void)
return result; return result;
} }
#define TIMEOUT 5
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -57,6 +57,5 @@ do_test (void)
return result; return result;
} }
#define TIMEOUT 6
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -123,6 +123,5 @@ do_test (void)
return 0; return 0;
} }
#define TIMEOUT 6
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

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

View File

@ -10,7 +10,6 @@
static int do_test (void); static int do_test (void);
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#define TIMEOUT 5
#include <test-skeleton.c> #include <test-skeleton.c>

View File

@ -17,6 +17,5 @@ do_test (void)
return 0; return 0;
} }
#define TIMEOUT 5
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -281,6 +281,5 @@ do_test (void)
return ret; return ret;
} }
#define TIMEOUT 20
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -115,6 +115,5 @@ do_test (void)
return 0; return 0;
} }
#define TIMEOUT 5
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -169,5 +169,4 @@ do_test (void)
} }
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#define TIMEOUT 4
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -205,5 +205,4 @@ cmdline_process (int c)
#define CMDLINE_PROCESS cmdline_process #define CMDLINE_PROCESS cmdline_process
#define CLEANUP_HANDLER do_cleanup #define CLEANUP_HANDLER do_cleanup
#define PREPARE do_prepare #define PREPARE do_prepare
#define TIMEOUT 5
#include <support/test-driver.c> #include <support/test-driver.c>

View File

@ -106,5 +106,4 @@ out:
} }
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#define TIMEOUT 5
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -199,6 +199,5 @@ do_test (void)
#endif #endif
} }
#define TIMEOUT 3
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -113,5 +113,4 @@ do_test (void)
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#define TIMEOUT 3
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -155,5 +155,4 @@ do_test (void)
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#define TIMEOUT 6
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -244,6 +244,5 @@ do_test (void)
return do_test_wait (thread_fun_timed); return do_test_wait (thread_fun_timed);
} }
#define TIMEOUT 20
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -285,5 +285,4 @@ do_test (int argc, char **argv)
return do_test_wait (timed_waiter); return do_test_wait (timed_waiter);
} }
#define TIMEOUT 5
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -133,6 +133,5 @@ do_test (void)
} }
#define TIMEOUT 5
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -27,7 +27,6 @@
static int do_test (void); static int do_test (void);
#define TIMEOUT 5
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -272,6 +272,5 @@ do_test (void)
return 0; return 0;
} }
#define TIMEOUT 4
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -198,6 +198,5 @@ do_test (void)
return 0; return 0;
} }
#define TIMEOUT 4
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -197,6 +197,5 @@ do_test (void)
return 0; return 0;
} }
#define TIMEOUT 3
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -99,5 +99,4 @@ do_test (void)
} }
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#define TIMEOUT 4
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -162,5 +162,4 @@ do_test (void)
} }
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#define TIMEOUT 4
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -197,5 +197,4 @@ do_test (void)
} }
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#define TIMEOUT 4
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -15,7 +15,6 @@ static void prepare (void);
#define PREPARE(argc, argv) prepare () #define PREPARE(argc, argv) prepare ()
static int do_test (void); static int do_test (void);
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#define TIMEOUT 5
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -89,6 +89,5 @@ do_test (void)
return 0; return 0;
} }
#define TIMEOUT 5
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -178,6 +178,5 @@ do_test (void)
} }
#define TIMEOUT 3
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -87,6 +87,5 @@ do_test (void)
return thread_fail; return thread_fail;
} }
#define TIMEOUT 10
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -75,6 +75,5 @@ do_test (void)
return 0; return 0;
} }
#define TIMEOUT 3
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -256,7 +256,6 @@ do_test (void)
return result; return result;
} }
# define TIMEOUT 10
# define TEST_FUNCTION do_test () # define TEST_FUNCTION do_test ()
#else #else

View File

@ -104,6 +104,5 @@ do_test (void)
return 0; return 0;
} }
#define TIMEOUT 5
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -41,7 +41,6 @@ static pthread_t th[N];
static int do_test (void); static int do_test (void);
#define TIMEOUT 5
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -176,6 +176,5 @@ do_test (void)
return 0; return 0;
} }
#define TIMEOUT 5
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -369,9 +369,4 @@ do_test (int argc, char *argv[])
return result; return result;
} }
/* We need a few seconds since we have a few sleeps in the code. */
#define TIMEOUT 20
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -64,5 +64,4 @@ do_test (void)
} }
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#define TIMEOUT 10
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -66,5 +66,4 @@ test (void)
} }
#define TEST_FUNCTION test () #define TEST_FUNCTION test ()
#define TIMEOUT 10
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -27,9 +27,6 @@ static void do_prepare (void);
static int do_test (void); static int do_test (void);
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
/* We might need a bit longer timeout. */
#define TIMEOUT 20 /* sec */
/* This defines the `main' function and some more. */ /* This defines the `main' function and some more. */
#include <test-skeleton.c> #include <test-skeleton.c>

View File

@ -244,6 +244,5 @@ do_test (void)
return 0; return 0;
} }
#define TIMEOUT 20
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -23,8 +23,6 @@
#include <sys/wait.h> #include <sys/wait.h>
#include <signal.h> #include <signal.h>
#define TIMEOUT 15
static void static void
test_child (void) test_child (void)
{ {

View File

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

View File

@ -115,5 +115,4 @@ do_test (void)
} }
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#define TIMEOUT 5
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -23,9 +23,6 @@
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
/* We might need a bit longer timeout. */
#define TIMEOUT 10 /* sec */
int my_signo; int my_signo;
volatile sig_atomic_t flag; volatile sig_atomic_t flag;

View File

@ -23,9 +23,6 @@
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
/* We might need a bit longer timeout. */
#define TIMEOUT 10 /* sec */
#define MY_SIVAL 27 #define MY_SIVAL 27
volatile sig_atomic_t flag; volatile sig_atomic_t flag;

View File

@ -23,10 +23,6 @@
#include <sys/time.h> #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 () #define TEST_FUNCTION do_test ()
static int static int
do_test (void) do_test (void)

View File

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

View File

@ -25,10 +25,6 @@
#include <unistd.h> #include <unistd.h>
/* We might wait for 3 seconds, so increase timeout to 10 seconds. */
#define TIMEOUT 10
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
static int static int
do_test (void) do_test (void)

View File

@ -120,5 +120,4 @@ do_test (void)
} }
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#define TIMEOUT 5
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -26,9 +26,6 @@
/* We want to see output immediately. */ /* We want to see output immediately. */
#define STDOUT_UNBUFFERED #define STDOUT_UNBUFFERED
/* We expect to run at least 10 seconds. */
#define TIMEOUT 15
static int static int
clock_test (clockid_t cl) clock_test (clockid_t cl)
{ {

View File

@ -316,6 +316,5 @@ do_test (void)
} }
#define TIMEOUT 5
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -330,7 +330,6 @@ do_test (void)
return result; return result;
} }
# define TIMEOUT 8
# define TEST_FUNCTION do_test () # define TEST_FUNCTION do_test ()
#endif #endif

View File

@ -35,7 +35,6 @@ alrm_handler (int sig)
{ {
} }
#define TIMEOUT 10
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
static int static int
do_test (void) do_test (void)

View File

@ -32,7 +32,6 @@
#include <unistd.h> #include <unistd.h>
#include "tst-mqueue.h" #include "tst-mqueue.h"
#define TIMEOUT 4
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
static int static int
do_test (void) do_test (void)

View File

@ -33,8 +33,6 @@
#include <unistd.h> #include <unistd.h>
#include "tst-mqueue.h" #include "tst-mqueue.h"
#define TIMEOUT 3
#if _POSIX_THREADS && defined SIGRTMIN && defined SA_SIGINFO #if _POSIX_THREADS && defined SIGRTMIN && defined SA_SIGINFO
# include <pthread.h> # include <pthread.h>

View File

@ -178,7 +178,6 @@ check_ts (const char *name, const struct timespec *start,
return 0; return 0;
} }
#define TIMEOUT 15
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
static int static int
do_test (void) do_test (void)

View File

@ -477,6 +477,5 @@ do_test (void)
return result; return result;
} }
#define TIMEOUT 3
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -10,7 +10,6 @@ static char tempdata[65 * 1024];
static int do_test (void); static int do_test (void);
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#define TIMEOUT 10
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -53,6 +53,5 @@ do_test (int argc, char **argv)
return 1; return 1;
} }
#define TIMEOUT 3
#define TEST_FUNCTION_ARGV do_test #define TEST_FUNCTION_ARGV do_test
#include <support/test-driver.c> #include <support/test-driver.c>

View File

@ -110,8 +110,5 @@ do_test (void)
return 0; return 0;
} }
/* Time enough for a large writev syscall to complete. */
#define TIMEOUT 20
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -54,6 +54,5 @@ do_test (void)
return 0; return 0;
} }
#define TIMEOUT 3
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#include "../test-skeleton.c" #include "../test-skeleton.c"

View File

@ -26,7 +26,6 @@
#include <unistd.h> #include <unistd.h>
#include <support/check.h> #include <support/check.h>
#define TIMEOUT 5
static int do_test (void); static int do_test (void);
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
#include "../test-skeleton.c" #include "../test-skeleton.c"