aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorEnji Cooper <ngie@FreeBSD.org>2014-11-16 05:06:35 +0000
committerEnji Cooper <ngie@FreeBSD.org>2014-11-16 05:06:35 +0000
commit190e1b1c9bd1779dc185a059759b645d844ad03c (patch)
treedd53edc120e2e587acefdea72e9cd0ebb3eeeb37 /contrib
parenta81c27fd8cd391226ef02bd5463e22a47df09777 (diff)
downloadsrc-190e1b1c9bd1779dc185a059759b645d844ad03c.tar.gz
src-190e1b1c9bd1779dc185a059759b645d844ad03c.zip
Only expect timeouts on powerpc with NetBSD
Submitted by: pho
Notes
Notes: svn path=/head/; revision=274572
Diffstat (limited to 'contrib')
-rw-r--r--contrib/netbsd-tests/lib/libpthread/t_mutex.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/contrib/netbsd-tests/lib/libpthread/t_mutex.c b/contrib/netbsd-tests/lib/libpthread/t_mutex.c
index b5b07b31b4f0..eb371fabd883 100644
--- a/contrib/netbsd-tests/lib/libpthread/t_mutex.c
+++ b/contrib/netbsd-tests/lib/libpthread/t_mutex.c
@@ -117,9 +117,11 @@ ATF_TC(mutex2);
ATF_TC_HEAD(mutex2, tc)
{
atf_tc_set_md_var(tc, "descr", "Checks mutexes");
+#ifdef __NetBSD__
#if defined(__powerpc__)
atf_tc_set_md_var(tc, "timeout", "40");
#endif
+#endif
}
ATF_TC_BODY(mutex2, tc)
{
@@ -129,9 +131,11 @@ ATF_TC_BODY(mutex2, tc)
printf("1: Mutex-test 2\n");
+#ifdef __NetBSD__
#if defined(__powerpc__)
atf_tc_expect_timeout("PR port-powerpc/44387");
#endif
+#endif
PTHREAD_REQUIRE(pthread_mutex_init(&mutex, NULL));
@@ -158,6 +162,7 @@ ATF_TC_BODY(mutex2, tc)
global_x, (long)joinval);
ATF_REQUIRE_EQ(global_x, 20000000);
+#ifdef __NetBSD__
#if defined(__powerpc__)
/* XXX force a timeout in ppc case since an un-triggered race
otherwise looks like a "failure" */
@@ -165,6 +170,7 @@ ATF_TC_BODY(mutex2, tc)
complain about unexpected success */
sleep(41);
#endif
+#endif
}
static void *
@@ -188,9 +194,11 @@ ATF_TC_HEAD(mutex3, tc)
{
atf_tc_set_md_var(tc, "descr", "Checks mutexes using a static "
"initializer");
+#ifdef __NetBSD__
#if defined(__powerpc__)
atf_tc_set_md_var(tc, "timeout", "40");
#endif
+#endif
}
ATF_TC_BODY(mutex3, tc)
{
@@ -200,9 +208,11 @@ ATF_TC_BODY(mutex3, tc)
printf("1: Mutex-test 3\n");
+#ifdef __NetBSD__
#if defined(__powerpc__)
atf_tc_expect_timeout("PR port-powerpc/44387");
#endif
+#endif
global_x = 0;
count = count2 = 10000000;
@@ -227,6 +237,7 @@ ATF_TC_BODY(mutex3, tc)
global_x, (long)joinval);
ATF_REQUIRE_EQ(global_x, 20000000);
+#ifdef __NetBSD__
#if defined(__powerpc__)
/* XXX force a timeout in ppc case since an un-triggered race
otherwise looks like a "failure" */
@@ -234,6 +245,7 @@ ATF_TC_BODY(mutex3, tc)
complain about unexpected success */
sleep(41);
#endif
+#endif
}
static void *