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.
This commit is contained in:
Joseph Myers 2017-01-05 17:39:38 +00:00
parent 30733525c6
commit 983a9637f7
7 changed files with 11 additions and 3 deletions

View File

@ -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.

View File

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

View File

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

View File

@ -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"

View File

@ -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"

View File

@ -177,4 +177,5 @@ do_test (void)
return 0;
}
#define TIMEOUT 900
#include <support/test-driver.c>

View File

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