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.

27 files changed, 0 insertions, 27 deletions

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);
 }
 
-#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 ff676a87e0..af74c9e91e 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 682c13158e..4afb0d5d0d 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 fec233cc58..4af3570aa5 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 03150b5a08..d8f30c6119 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 f0fbd3797c..bd938b6962 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 6bf968f0b5..506382f4a7 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 e86eb02920..17aa32b5dd 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 08c3d8d057..e7951e5b50 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 397853b16e..982007aadd 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 9c636250d4..f6969a4b84 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 1d6ba179be..befc14f2d8 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 f11a55fc18..8d3d097880 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 426b968c4e..18a1a21785 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 c566d38d7c..9c7cbf71a2 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 16a7406534..c51df5156a 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 5b23a172ca..99fe7aa6aa 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 8968bd4753..54212b2199 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 70f9515a0c..d66033f000 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"