Increase some test timeouts.

This patch increases timeouts on some tests I've observed timing out.

elf/tst-tls13 and iconvdata/tst-loading both dynamically load many
objects and so are slow when testing over NFS.  They had timeouts set
from before the default changed from 2 to 20 seconds; this patch
removes those old settings, so effectively increasing the timeout to
20 seconds (from 3 and 10 seconds respectively).

malloc/tst-malloc-thread-fail.c and malloc/tst-mallocfork2.c are slow
on slow systems and so I set a fairly arbitrary 100 second timeout,
which seems to suffice on the system where I saw them timing out.

nss/tst-cancel-getpwuid_r.c and nss/tst-nss-getpwent.c are slow on
systems with a large passwd file; I set timeouts that empirically
worked for me.  (It seems tst-cancel-getpwuid_r.c is hitting the
100000 getpwuid_r call limit in my testing, with each call taking a
bit over 0.007 seconds, so 700 seconds for the test.)

	* elf/tst-tls13.c (TIMEOUT): Remove.
	* iconvdata/tst-loading.c (TIMEOUT): Likewise.
	* malloc/tst-malloc-thread-fail.c (TIMEOUT): Increase to 100.
	* malloc/tst-mallocfork2.c (TIMEOUT): Define to 100.
	* nss/tst-cancel-getpwuid_r.c (TIMEOUT): Define to 900.
	* nss/tst-nss-getpwent.c (TIMEOUT): Define to 300.

7 files changed, 11 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 801bb3aa48..88f9f068f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2017-01-05  Joseph Myers  <joseph@codesourcery.com>
 
+	* elf/tst-tls13.c (TIMEOUT): Remove.
+	* iconvdata/tst-loading.c (TIMEOUT): Likewise.
+	* malloc/tst-malloc-thread-fail.c (TIMEOUT): Increase to 100.
+	* malloc/tst-mallocfork2.c (TIMEOUT): Define to 100.
+	* nss/tst-cancel-getpwuid_r.c (TIMEOUT): Define to 900.
+	* nss/tst-nss-getpwent.c (TIMEOUT): Define to 300.
+
 	[BZ #21026]
 	* sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list
 	(readahead): New syscall entry.
diff --git a/elf/tst-tls13.c b/elf/tst-tls13.c
index 06bfbacb5c..9af08cf752 100644
--- a/elf/tst-tls13.c
+++ b/elf/tst-tls13.c
@@ -26,5 +26,4 @@ do_test (void)
 }
 
 #define TEST_FUNCTION do_test ()
-#define TIMEOUT 3
 #include "../test-skeleton.c"
diff --git a/iconvdata/tst-loading.c b/iconvdata/tst-loading.c
index dd820e1b4e..4aac51c7a4 100644
--- a/iconvdata/tst-loading.c
+++ b/iconvdata/tst-loading.c
@@ -181,6 +181,5 @@ do_test (void)
   return result;
 }
 
-#define TIMEOUT 10
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"
diff --git a/malloc/tst-malloc-thread-fail.c b/malloc/tst-malloc-thread-fail.c
index 7f5b046bfa..2745a33856 100644
--- a/malloc/tst-malloc-thread-fail.c
+++ b/malloc/tst-malloc-thread-fail.c
@@ -436,7 +436,7 @@ do_test (void)
 }
 
 /* The repeated allocations take some time on slow machines.  */
-#define TIMEOUT 30
+#define TIMEOUT 100
 
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"
diff --git a/malloc/tst-mallocfork2.c b/malloc/tst-mallocfork2.c
index c896628330..bb6a3319d8 100644
--- a/malloc/tst-mallocfork2.c
+++ b/malloc/tst-mallocfork2.c
@@ -45,6 +45,7 @@ enum { malloc_maximum_size = 70000 };
 enum { signal_count = 1000 };
 
 static int do_test (void);
+#define TIMEOUT 100
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"
 
diff --git a/nss/tst-cancel-getpwuid_r.c b/nss/tst-cancel-getpwuid_r.c
index 254024f6cd..d4fbb861c0 100644
--- a/nss/tst-cancel-getpwuid_r.c
+++ b/nss/tst-cancel-getpwuid_r.c
@@ -177,4 +177,5 @@ do_test (void)
   return 0;
 }
 
+#define TIMEOUT 900
 #include <support/test-driver.c>
diff --git a/nss/tst-nss-getpwent.c b/nss/tst-nss-getpwent.c
index 7a6d81b5ee..7bd69fc378 100644
--- a/nss/tst-nss-getpwent.c
+++ b/nss/tst-nss-getpwent.c
@@ -114,5 +114,6 @@ do_test (void)
   return 0;
 }
 
+#define TIMEOUT 300
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"