summaryrefslogtreecommitdiff
path: root/libc/nptl
diff options
context:
space:
mode:
Diffstat (limited to 'libc/nptl')
-rw-r--r--libc/nptl/ChangeLog5
-rw-r--r--libc/nptl/tst-cond24.c2
-rw-r--r--libc/nptl/tst-sem14.c1
3 files changed, 7 insertions, 1 deletions
diff --git a/libc/nptl/ChangeLog b/libc/nptl/ChangeLog
index 0e0167529..93e994669 100644
--- a/libc/nptl/ChangeLog
+++ b/libc/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/libc/nptl/tst-cond24.c b/libc/nptl/tst-cond24.c
index 2eb2df1a3..bfcc171e6 100644
--- a/libc/nptl/tst-cond24.c
+++ b/libc/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/libc/nptl/tst-sem14.c b/libc/nptl/tst-sem14.c
index 949c03fcc..f1e3e9e44 100644
--- a/libc/nptl/tst-sem14.c
+++ b/libc/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"