[src/netbsd-7]: src/tests/lib/libpthread Pull up following revision(s) (reque...

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

details:   https://anonhg.NetBSD.org/src/rev/84963437b1e6
branches:  netbsd-7
changeset: 798733:84963437b1e6
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Mon Dec 22 02:06:10 2014 +0000

description:
Pull up following revision(s) (requested by gson in ticket #346):
        tests/lib/libpthread/t_cond.c: revision 1.6
The cond_timedwait_race test case is no longer expected to fail; it
has been consistently passing since CVS date 2014.01.31.19.22.00.
See also PR lib/44756.

diffstat:

 tests/lib/libpthread/t_cond.c |  28 ++++++++++------------------
 1 files changed, 10 insertions(+), 18 deletions(-)

diffs (52 lines):

diff -r efbb685469be -r 84963437b1e6 tests/lib/libpthread/t_cond.c
--- a/tests/lib/libpthread/t_cond.c     Mon Dec 22 02:05:08 2014 +0000
+++ b/tests/lib/libpthread/t_cond.c     Mon Dec 22 02:06:10 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: t_cond.c,v 1.5 2013/10/19 17:45:01 christos Exp $ */
+/* $NetBSD: t_cond.c,v 1.5.4.1 2014/12/22 02:06:10 msaitoh 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_cond.c,v 1.5 2013/10/19 17:45:01 christos Exp $");
+__RCSID("$NetBSD: t_cond.c,v 1.5.4.1 2014/12/22 02:06:10 msaitoh Exp $");
 
 #include <sys/time.h>
 
@@ -343,25 +343,17 @@
 ATF_TC_BODY(cond_timedwait_race, tc)
 {
        pthread_t tid[64];
-       size_t i, j;
+       size_t i;
+
+       for (i = 0; i < __arraycount(tid); i++) {
 
-       atf_tc_expect_fail("PR lib/44756");
-       /* This outer loop is to ensure that a false positive of this race
-        * test does not report the test as broken (due to the test not
-        * triggering the expected failure).  However, we want to make this
-        * fail consistently when the race is resolved, and this approach
-        * will have the desired effect. */
-       for (j = 0; j < 10; j++ ) {
-               for (i = 0; i < __arraycount(tid); i++) {
+               PTHREAD_REQUIRE(pthread_create(&tid[i], NULL,
+                   pthread_cond_timedwait_func, NULL));
+       }
 
-                       PTHREAD_REQUIRE(pthread_create(&tid[i], NULL,
-                           pthread_cond_timedwait_func, NULL));
-               }
+       for (i = 0; i < __arraycount(tid); i++) {
 
-               for (i = 0; i < __arraycount(tid); i++) {
-
-                       PTHREAD_REQUIRE(pthread_join(tid[i], NULL));
-               }
+               PTHREAD_REQUIRE(pthread_join(tid[i], NULL));
        }
 }