From: Chris Metcalf <cmetcalf@tilera.com>
Date: Tue, 6 Nov 2012 18:10:19 +0000 (-0500)
Subject: Bump timeouts on some new nptl tests to support tilepro.
X-Git-Tag: glibc-2.17~253
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=91e0d40e89af9df60cac4036b1b972bb95228281;p=thirdparty%2Fglibc.git

Bump timeouts on some new nptl tests to support tilepro.
---

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 0e01675290d..93e994669d1 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-06  Chris Metcalf  <cmetcalf@tilera.com>
+
+	* tst-sem14.c (TIMEOUT): Set timeout to 10 seconds.
+	* tst-cond24.c (TIMEOUT): Increase from 10 to 20 seconds.
+
 2012-11-05  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
 	* pthread_cond_timedwait.c (__pthread_cond_timedwait): Time out
diff --git a/nptl/tst-cond24.c b/nptl/tst-cond24.c
index 2eb2df1a3f9..bfcc171e6ea 100644
--- a/nptl/tst-cond24.c
+++ b/nptl/tst-cond24.c
@@ -244,6 +244,6 @@ do_test (void)
   return do_test_wait (thread_fun_timed);
 }
 
-#define TIMEOUT 10
+#define TIMEOUT 20
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"
diff --git a/nptl/tst-sem14.c b/nptl/tst-sem14.c
index 949c03fcc6a..f1e3e9e4484 100644
--- a/nptl/tst-sem14.c
+++ b/nptl/tst-sem14.c
@@ -87,5 +87,6 @@ do_test (void)
   return thread_fail;
 }
 
+#define TIMEOUT 10
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"