diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | elf/tst-tls13.c | 1 | ||||
| -rw-r--r-- | iconvdata/tst-loading.c | 1 | ||||
| -rw-r--r-- | malloc/tst-malloc-thread-fail.c | 2 | ||||
| -rw-r--r-- | malloc/tst-mallocfork2.c | 1 | ||||
| -rw-r--r-- | nss/tst-cancel-getpwuid_r.c | 1 | ||||
| -rw-r--r-- | nss/tst-nss-getpwent.c | 1 |
7 files changed, 11 insertions, 3 deletions
@@ -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" |