about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--malloc/tst-malloc-thread-fail.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cc875c5120..fc313b4307 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-07-05  Chris Metcalf  <cmetcalf@mellanox.com>
+
+	* malloc/tst-malloc-thread-fail.c (TIMEOUT): Bump up to 30s.
+
 2016-07-05  Rajalakshmi Srinivasaraghavan  <raji@linux.vnet.ibm.com>
 
 	[BZ #20327]
diff --git a/malloc/tst-malloc-thread-fail.c b/malloc/tst-malloc-thread-fail.c
index fc090efccd..fca0eb86df 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 20
+#define TIMEOUT 30
 
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"