diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2017-01-05 17:39:38 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2017-01-05 17:39:38 +0000 |
| commit | 983a9637f730fa265e228509d090c4c5f031d713 (patch) | |
| tree | 79774f5847eb121d629f6826b7edf155a0cc0e48 /malloc | |
| parent | 30733525c6867c160261db1afade6326000f9f75 (diff) | |
| download | glibc-983a9637f730fa265e228509d090c4c5f031d713.zip glibc-983a9637f730fa265e228509d090c4c5f031d713.tar.gz glibc-983a9637f730fa265e228509d090c4c5f031d713.tar.bz2 | |
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.
Diffstat (limited to 'malloc')
| -rw-r--r-- | malloc/tst-malloc-thread-fail.c | 2 | ||||
| -rw-r--r-- | malloc/tst-mallocfork2.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/malloc/tst-malloc-thread-fail.c b/malloc/tst-malloc-thread-fail.c index 7f5b046..2745a33 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 c896628..bb6a331 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" |