From ce5a7de6cd1479a1e78fda0db023bd4effa072a4 Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@suse.de>
Date: Tue, 16 Oct 2018 17:45:02 +0200
Subject: 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.
---
 rt/tst-aio.c       | 3 ---
 rt/tst-aio10.c     | 1 -
 rt/tst-aio4.c      | 3 ---
 rt/tst-aio5.c      | 3 ---
 rt/tst-aio6.c      | 4 ----
 rt/tst-aio64.c     | 3 ---
 rt/tst-aio7.c      | 4 ----
 rt/tst-aio9.c      | 1 -
 rt/tst-clock.c     | 3 ---
 rt/tst-cpuclock1.c | 1 -
 rt/tst-cpuclock2.c | 1 -
 rt/tst-mqueue2.c   | 1 -
 rt/tst-mqueue4.c   | 1 -
 rt/tst-mqueue5.c   | 2 --
 rt/tst-timer4.c    | 1 -
 15 files changed, 32 deletions(-)

(limited to 'rt')

diff --git a/rt/tst-aio.c b/rt/tst-aio.c
index f3b51d2183..7d864d2aaa 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 6e8f7b78c0..ebd0193b3c 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 a86496b432..8b8823ba85 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 20182a205c..8b51e4dd38 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 886b2d81c3..37bc32325a 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 f572fad1dc..d58b7266e5 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 e0df6b0aac..69a3822f44 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 eab4f6859a..c13d9f7e72 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 bec76d0152..61417c4025 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 f6d76e3614..b2b2f27ad1 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 f57cfb4a0c..119e67b916 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 bc15e2907f..3e49a9e160 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 4910755643..ed4176409c 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 e96d7c3dc5..377998ecc8 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 80e3051379..5989a4a74f 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)
-- 
cgit v1.2.3