From patchwork Fri Jun 25 08:11:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kurt Kanzenbach X-Patchwork-Id: 44015 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 C477639C050F for ; Fri, 25 Jun 2021 08:14:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C477639C050F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1624608896; bh=4kM3F6ZrgYaoFKzAStmGjJa3Es1BWiFfYqGaa6ziSS0=; 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=HtTu727DxwR+UIAWDIjpDQObbrZ2Corps0xUEDxzosBYkxJuC5M2mYEhUeG7MJsJ0 1Uq4Cw9c/GNfSN3N51+puYwUDc9wHS05to0V/ToOMaTwD1Kqe4v2thB2IHVXjGDWWr QOvxRkj50+JcvZ4dSf70PT6gum4gXVCq2rGaJTSA= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by sourceware.org (Postfix) with ESMTPS id C289239BECE3 for ; Fri, 25 Jun 2021 08:11:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C289239BECE3 To: libc-alpha@sourceware.org Subject: [PATCH v1 4/6] nptl: Remove mutex test 10 Date: Fri, 25 Jun 2021 10:11:02 +0200 Message-Id: <20210625081104.1134598-5-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.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, KAM_SHORT, 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" That test checks whether pthread_mutex_clocklock(MONOTONIC)/PI returns EINVAL. However, support for that has been implemented. Therefore, remove the test. Signed-off-by: Kurt Kanzenbach --- nptl/Makefile | 2 +- nptl/tst-mutexpi10.c | 68 -------------------------------------------- 2 files changed, 1 insertion(+), 69 deletions(-) delete mode 100644 nptl/tst-mutexpi10.c diff --git a/nptl/Makefile b/nptl/Makefile index c64e4af2f680..5ab25c524fac 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -269,7 +269,7 @@ tests = tst-attr2 tst-attr3 tst-default-attr \ tst-mutex5a tst-mutex7a \ tst-mutexpi1 tst-mutexpi2 tst-mutexpi3 tst-mutexpi4 \ tst-mutexpi5 tst-mutexpi5a tst-mutexpi6 tst-mutexpi7 tst-mutexpi7a \ - tst-mutexpi9 tst-mutexpi10 \ + tst-mutexpi9 \ tst-cond22 tst-cond26 \ tst-robustpi1 tst-robustpi2 tst-robustpi3 tst-robustpi4 tst-robustpi5 \ tst-robustpi6 tst-robustpi7 tst-robustpi9 \ diff --git a/nptl/tst-mutexpi10.c b/nptl/tst-mutexpi10.c deleted file mode 100644 index da781d0d7a93..000000000000 --- a/nptl/tst-mutexpi10.c +++ /dev/null @@ -1,68 +0,0 @@ -/* Check if pthread_mutex_clocklock with PRIO_INHERIT fails with clock - different than CLOCK_REALTIME. - Copyright (C) 2020-2021 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#include -#include -#include - -#include -#include -#include - -static int -do_test (void) -{ - const int types[] = { - PTHREAD_MUTEX_NORMAL, - PTHREAD_MUTEX_ERRORCHECK, - PTHREAD_MUTEX_RECURSIVE, - PTHREAD_MUTEX_ADAPTIVE_NP - }; - const int robust[] = { - PTHREAD_MUTEX_STALLED, - PTHREAD_MUTEX_ROBUST - }; - - - for (int t = 0; t < array_length (types); t++) - for (int r = 0; r < array_length (robust); r++) - { - pthread_mutexattr_t attr; - - xpthread_mutexattr_init (&attr); - xpthread_mutexattr_setprotocol (&attr, PTHREAD_PRIO_INHERIT); - xpthread_mutexattr_settype (&attr, types[t]); - xpthread_mutexattr_setrobust (&attr, robust[r]); - - pthread_mutex_t mtx; - xpthread_mutex_init (&mtx, &attr); - - struct timespec tmo = timespec_add (xclock_now (CLOCK_MONOTONIC), - make_timespec (0, 100000000)); - - TEST_COMPARE (pthread_mutex_clocklock (&mtx, CLOCK_MONOTONIC, &tmo), - EINVAL); - - xpthread_mutex_destroy (&mtx); - } - - return 0; -} - -#include