From patchwork Fri Jun 25 08:11:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kurt Kanzenbach X-Patchwork-Id: 44016 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F230A39C0517 for ; Fri, 25 Jun 2021 08:15:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F230A39C0517 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1624608941; bh=s2eDUsIjebBmqpJJ77d7cAjv42W50THtY9sH+mVlOAE=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=lTdNIn4izAdAd/pHcxK8VxliYK5941YfENjiDa7Y60UU3byzccWxW41dlJHvFFtIr tJhfVagqlOLTU6z31M4vYseDR7i5DXKRB+BKuWhvySN6ko7SHeTEoNW+FCcYDB/Iu7 Ymr7dKHTAYEJwE6StqaKvcLsGIjmfG8hX3oMSZaw= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org 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 To: libc-alpha@sourceware.org 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 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-Patchwork-Original-From: Kurt Kanzenbach via Libc-alpha From: Kurt Kanzenbach Reply-To: Kurt Kanzenbach Cc: Florian Weimer , Sebastian Andrzej Siewior , Kurt Kanzenbach , Peter Zijlstra , Thomas Gleixner , Joseph Myers Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" 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; }