about summary refs log tree commit diff
diff options
context:
space:
mode:
authorChris Metcalf <cmetcalf@tilera.com>2012-11-06 13:10:19 -0500
committerChris Metcalf <cmetcalf@tilera.com>2012-11-06 13:10:19 -0500
commit91e0d40e89af9df60cac4036b1b972bb95228281 (patch)
treedd26b7ce2f4d37ebd83621f13aa7b9abcd97e508
parent351dc60c55467552753646c1f585c3fb54cb2b06 (diff)
downloadglibc-91e0d40e89af9df60cac4036b1b972bb95228281.tar.gz
glibc-91e0d40e89af9df60cac4036b1b972bb95228281.tar.xz
glibc-91e0d40e89af9df60cac4036b1b972bb95228281.zip
Bump timeouts on some new nptl tests to support tilepro.
-rw-r--r--nptl/ChangeLog5
-rw-r--r--nptl/tst-cond24.c2
-rw-r--r--nptl/tst-sem14.c1
3 files changed, 7 insertions, 1 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 0e01675290..93e994669d 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 2eb2df1a3f..bfcc171e6e 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 949c03fcc6..f1e3e9e448 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"