[src/trunk]: src/tests/lib/libpthread reenable mutex2 and mutex3 on powerpc n...

[chs <chs%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c81aaadd64b3
branches:  trunk
changeset: 351907:c81aaadd64b3
user:      chs <chs%NetBSD.org@localhost>
date:      Sun Mar 05 16:08:23 2017 +0000

description:
reenable mutex2 and mutex3 on powerpc now that PR 44387 is fixed.

diffstat:

 tests/lib/libpthread/t_mutex.c |  34 ++--------------------------------
 1 files changed, 2 insertions(+), 32 deletions(-)

diffs (90 lines):

diff -r 7195629aa7d3 -r c81aaadd64b3 tests/lib/libpthread/t_mutex.c
--- a/tests/lib/libpthread/t_mutex.c    Sun Mar 05 16:07:38 2017 +0000
+++ b/tests/lib/libpthread/t_mutex.c    Sun Mar 05 16:08:23 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: t_mutex.c,v 1.15 2017/01/16 16:23:41 christos Exp $ */
+/* $NetBSD: t_mutex.c,v 1.16 2017/03/05 16:08:23 chs Exp $ */
 
 /*
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2008\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_mutex.c,v 1.15 2017/01/16 16:23:41 christos Exp $");
+__RCSID("$NetBSD: t_mutex.c,v 1.16 2017/03/05 16:08:23 chs Exp $");
 
 #include <sys/time.h> /* For timespecadd */
 #include <inttypes.h> /* For UINT16_MAX */
@@ -148,9 +148,6 @@
 ATF_TC_HEAD(mutex2, tc)
 {
        atf_tc_set_md_var(tc, "descr", "Checks mutexes");
-#if defined(__powerpc__)
-       atf_tc_set_md_var(tc, "timeout", "40");
-#endif
 }
 ATF_TC_BODY(mutex2, tc)
 {
@@ -160,10 +157,6 @@
 
        printf("1: Mutex-test 2\n");
 
-#if defined(__powerpc__)
-       atf_tc_expect_timeout("PR port-powerpc/44387");
-#endif
-
        PTHREAD_REQUIRE(pthread_mutex_init(&mutex, NULL));
        
        global_x = 0;
@@ -188,14 +181,6 @@
        printf("1: Thread joined. X was %d. Return value (long) was %ld\n",
                global_x, (long)joinval);
        ATF_REQUIRE_EQ(global_x, 20000000);
-
-#if defined(__powerpc__)
-       /* XXX force a timeout in ppc case since an un-triggered race
-          otherwise looks like a "failure" */
-       /* We sleep for longer than the timeout to make ATF not
-          complain about unexpected success */
-       sleep(41);
-#endif
 }
 
 static void *
@@ -219,9 +204,6 @@
 {
        atf_tc_set_md_var(tc, "descr", "Checks mutexes using a static "
            "initializer");
-#if defined(__powerpc__)
-       atf_tc_set_md_var(tc, "timeout", "40");
-#endif
 }
 ATF_TC_BODY(mutex3, tc)
 {
@@ -231,10 +213,6 @@
 
        printf("1: Mutex-test 3\n");
 
-#if defined(__powerpc__)
-       atf_tc_expect_timeout("PR port-powerpc/44387");
-#endif
-
        global_x = 0;
        count = count2 = 10000000;
 
@@ -257,14 +235,6 @@
        printf("1: Thread joined. X was %d. Return value (long) was %ld\n",
                global_x, (long)joinval);
        ATF_REQUIRE_EQ(global_x, 20000000);
-
-#if defined(__powerpc__)
-       /* XXX force a timeout in ppc case since an un-triggered race
-          otherwise looks like a "failure" */
-       /* We sleep for longer than the timeout to make ATF not
-          complain about unexpected success */
-       sleep(41);
-#endif
 }
 
 static void *