diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2017-07-06 17:01:03 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2017-07-06 17:01:03 +0000 |
| commit | 3cefdd7310a5d1fad45648d9346e47df9c185fdc (patch) | |
| tree | 60569b2effb5592908e1fd19789559cd13cc5882 | |
| parent | 1bea5858dd5b2615288e96525f3918e35f42dd2d (diff) | |
| download | glibc-3cefdd7310a5d1fad45648d9346e47df9c185fdc.tar.gz glibc-3cefdd7310a5d1fad45648d9346e47df9c185fdc.tar.xz glibc-3cefdd7310a5d1fad45648d9346e47df9c185fdc.zip | |
Increase some test timeouts.
This patch increases the timeouts for some tests that I've seen timing out on slow systems in my 2.26 release testing. (In the case of tst-tsearch.c, increasing the timeout means removing a setting of 10 that was put there before the default timeout was increased to 20 seconds, so putting the default into effect.) * iconvdata/tst-loading.c (TIMEOUT): Define to 30. * misc/tst-tsearch.c (TIMEOUT): Remove. * nptl/tst-create-detached.c (TIMEOUT): Define to 100. * nptl/tst-robust-fork.c (TIMEOUT): Likewise. * nptl/tst-rwlock19.c (TIMEOUT): Likewise. * string/tst-cmp.c (TIMEOUT): Define to 600.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | iconvdata/tst-loading.c | 1 | ||||
| -rw-r--r-- | misc/tst-tsearch.c | 1 | ||||
| -rw-r--r-- | nptl/tst-create-detached.c | 1 | ||||
| -rw-r--r-- | nptl/tst-robust-fork.c | 1 | ||||
| -rw-r--r-- | nptl/tst-rwlock19.c | 2 | ||||
| -rw-r--r-- | string/tst-cmp.c | 2 |
7 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 04a2647d90..ac598984e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2017-07-06 Joseph Myers <joseph@codesourcery.com> + + * iconvdata/tst-loading.c (TIMEOUT): Define to 30. + * misc/tst-tsearch.c (TIMEOUT): Remove. + * nptl/tst-create-detached.c (TIMEOUT): Define to 100. + * nptl/tst-robust-fork.c (TIMEOUT): Likewise. + * nptl/tst-rwlock19.c (TIMEOUT): Likewise. + * string/tst-cmp.c (TIMEOUT): Define to 600. + 2017-07-06 Matthew Krupcale <mkrupcale@matthewkrupcale.com> [BZ #21715] diff --git a/iconvdata/tst-loading.c b/iconvdata/tst-loading.c index 4aac51c7a4..4f343e67bc 100644 --- a/iconvdata/tst-loading.c +++ b/iconvdata/tst-loading.c @@ -181,5 +181,6 @@ do_test (void) return result; } +#define TIMEOUT 30 #define TEST_FUNCTION do_test () #include "../test-skeleton.c" diff --git a/misc/tst-tsearch.c b/misc/tst-tsearch.c index 6c8fff0e3f..5e3c473694 100644 --- a/misc/tst-tsearch.c +++ b/misc/tst-tsearch.c @@ -351,6 +351,5 @@ do_test (void) return total_error; } -#define TIMEOUT 10 #define TEST_FUNCTION do_test () #include "../test-skeleton.c" diff --git a/nptl/tst-create-detached.c b/nptl/tst-create-detached.c index ea93e441c7..551a845496 100644 --- a/nptl/tst-create-detached.c +++ b/nptl/tst-create-detached.c @@ -134,4 +134,5 @@ do_test (void) return 0; } +#define TIMEOUT 100 #include <support/test-driver.c> diff --git a/nptl/tst-robust-fork.c b/nptl/tst-robust-fork.c index 4a12ff000d..ec0fd3c42b 100644 --- a/nptl/tst-robust-fork.c +++ b/nptl/tst-robust-fork.c @@ -181,4 +181,5 @@ do_test (void) return 0; } +#define TIMEOUT 100 #include <support/test-driver.c> diff --git a/nptl/tst-rwlock19.c b/nptl/tst-rwlock19.c index 746d84d92f..47c6f43d9f 100644 --- a/nptl/tst-rwlock19.c +++ b/nptl/tst-rwlock19.c @@ -122,6 +122,6 @@ do_test (void) return 0; } -#define TIMEOUT 30 +#define TIMEOUT 100 #define TEST_FUNCTION do_test () #include "../test-skeleton.c" diff --git a/string/tst-cmp.c b/string/tst-cmp.c index d7720194e9..7ddbd0b24e 100644 --- a/string/tst-cmp.c +++ b/string/tst-cmp.c @@ -207,6 +207,6 @@ do_test (void) /* The nested loops need a long time to complete on slower machines. */ -#define TIMEOUT 300 +#define TIMEOUT 600 #include <support/test-driver.c> |