Date: Sun, 16 Nov 2014 05:06:35 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r274572 - head/contrib/netbsd-tests/lib/libpthread Message-ID: <201411160506.sAG56ZJd055391@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sun Nov 16 05:06:35 2014 New Revision: 274572 URL: https://svnweb.freebsd.org/changeset/base/274572 Log: Only expect timeouts on powerpc with NetBSD Submitted by: pho Modified: head/contrib/netbsd-tests/lib/libpthread/t_mutex.c Modified: head/contrib/netbsd-tests/lib/libpthread/t_mutex.c ============================================================================== --- head/contrib/netbsd-tests/lib/libpthread/t_mutex.c Sun Nov 16 05:05:18 2014 (r274571) +++ head/contrib/netbsd-tests/lib/libpthread/t_mutex.c Sun Nov 16 05:06:35 2014 (r274572) @@ -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 *
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411160506.sAG56ZJd055391>