From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by sourceware.org (Postfix) with ESMTPS id 52B7139BF485 for ; Fri, 25 Jun 2021 08:11:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 52B7139BF485 From: Kurt Kanzenbach To: libc-alpha@sourceware.org Cc: Adhemerval Zanella , Florian Weimer , Carlos O'Donell , Lukasz Majewski , Thomas Gleixner , Sebastian Andrzej Siewior , Peter Zijlstra , Joseph Myers , Kurt Kanzenbach Subject: [PATCH v1 6/6] nptl: mutex-test9: Include CLOCK_MONOTONIC for PI Date: Fri, 25 Jun 2021 10:11:04 +0200 Message-Id: <20210625081104.1134598-7-kurt@linutronix.de> In-Reply-To: <20210625081104.1134598-1-kurt@linutronix.de> References: <20210625081104.1134598-1-kurt@linutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-10.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jun 2021 08:11:31 -0000 pthread_mutex_clocklock(MONOTONIC)/PI is now supported. Adjust the test accordingly. Signed-off-by: Kurt Kanzenbach --- sysdeps/pthread/tst-mutex9.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sysdeps/pthread/tst-mutex9.c b/sysdeps/pthread/tst-mutex9.c index 58c3a1aec263..d53eda841551 100644 --- a/sysdeps/pthread/tst-mutex9.c +++ b/sysdeps/pthread/tst-mutex9.c @@ -114,7 +114,12 @@ do_test_clock (clockid_t clockid) if (clockid == CLOCK_USE_TIMEDLOCK) TEST_COMPARE (pthread_mutex_timedlock (m, &ts), ETIMEDOUT); else - TEST_COMPARE (pthread_mutex_clocklock (m, clockid, &ts), ETIMEDOUT); + { + int err = pthread_mutex_clocklock (m, clockid, &ts); + + TEST_VERIFY (err == ETIMEDOUT || + (clockid == CLOCK_MONOTONIC && err == EINVAL)); + } alarm (1); @@ -144,9 +149,7 @@ do_test (void) do_test_clock (CLOCK_USE_TIMEDLOCK); do_test_clock (CLOCK_REALTIME); -#ifndef ENABLE_PI do_test_clock (CLOCK_MONOTONIC); -#endif return 0; } -- 2.30.2