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.

diff --git a/ChangeLog b/ChangeLog
index 04a2647d9098e69b6974542d43d74e88e60591c4..ac598984e368043b45cce9a098accadd37e7792a 100644 (file)
--- 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 4aac51c7a4ebcf1c16d581b841121c2692a1b769..4f343e67bc92371ba4f7ad81c3a000710fc64e44 100644 (file)
--- 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 6c8fff0e3fb0001ecaf8802785d39aac69da3932..5e3c473694ea68f93de678fca8bb7ab328881609 100644 (file)
--- 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 ea93e441c7e1f989aa7b1842b61ef7a36c4aad83..551a8454965004671027fe1a81151361ef01e2ce 100644 (file)
--- 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 4a12ff000db4c84ed77b071daed54ba03563cf53..ec0fd3c42b118be8aa19bad657352eb24051e505 100644 (file)
--- 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 746d84d92fd3b88603c0c6661c302ac2f44a6125..47c6f43d9fb5b62aba876567937585748724f4cd 100644 (file)
--- 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 d7720194e9e570473e870825cd377359143bd278..7ddbd0b24e3beedc9d97c31ecb0de40f9fb31654 100644 (file)
--- 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>