aboutsummaryrefslogtreecommitdiff
path: root/iconvdata
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2017-01-05 17:39:38 +0000
committerJoseph Myers <joseph@codesourcery.com>2017-01-05 17:39:38 +0000
commit983a9637f730fa265e228509d090c4c5f031d713 (patch)
tree79774f5847eb121d629f6826b7edf155a0cc0e48 /iconvdata
parent30733525c6867c160261db1afade6326000f9f75 (diff)
downloadglibc-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 'iconvdata')
-rw-r--r--iconvdata/tst-loading.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/iconvdata/tst-loading.c b/iconvdata/tst-loading.c
index dd820e1..4aac51c 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"