From patchwork Thu Apr 22 06:57:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xie Ziyao X-Patchwork-Id: 1469007 X-Patchwork-Delegate: petr.vorel@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FQpCL45j6z9sWD for ; Thu, 22 Apr 2021 16:57:50 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id C87FE3C6A91 for ; Thu, 22 Apr 2021 08:57:47 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-7.smtp.seeweb.it (in-7.smtp.seeweb.it [IPv6:2001:4b78:1:20::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id EC34C3C0EFF for ; Thu, 22 Apr 2021 08:57:36 +0200 (CEST) Received: from szxga05-in.huawei.com (szxga05-in.huawei.com [45.249.212.191]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by in-7.smtp.seeweb.it (Postfix) with ESMTPS id 1BB0D201094 for ; Thu, 22 Apr 2021 08:57:34 +0200 (CEST) Received: from DGGEMS401-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4FQp8F2htxzrdnm for ; Thu, 22 Apr 2021 14:55:09 +0800 (CST) Received: from ubuntu1804.huawei.com (10.67.174.209) by DGGEMS401-HUB.china.huawei.com (10.3.19.201) with Microsoft SMTP Server id 14.3.498.0; Thu, 22 Apr 2021 14:57:23 +0800 From: Xie Ziyao To: Date: Thu, 22 Apr 2021 14:57:32 +0800 Message-ID: <20210422065732.61222-3-xieziyao@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210422065732.61222-1-xieziyao@huawei.com> References: <20210422065732.61222-1-xieziyao@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.174.209] X-CFilter-Loop: Reflected X-Virus-Scanned: clamav-milter 0.102.4 at in-7.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.0 required=7.0 tests=SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-7.smtp.seeweb.it Subject: [LTP] [PATCH 2/2] syscalls/tkill: Convert tkill02 to the new API X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Cleanup and convert tkill02 to the new API. Signed-off-by: Xie Ziyao Reviewed-by: Petr Vorel Reviewed-by: Petr Vorel --- testcases/kernel/syscalls/tkill/tkill02.c | 105 +++++++--------------- 1 file changed, 32 insertions(+), 73 deletions(-) -- 2.17.1 diff --git a/testcases/kernel/syscalls/tkill/tkill02.c b/testcases/kernel/syscalls/tkill/tkill02.c index 48431755b..20b461705 100644 --- a/testcases/kernel/syscalls/tkill/tkill02.c +++ b/testcases/kernel/syscalls/tkill/tkill02.c @@ -1,28 +1,18 @@ -/****************************************************************************** - * Copyright (c) Crackerjack Project., 2007 * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program 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 General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the Free Software Foundation, * - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * * - ******************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later /* - * File: tkill02.c + * Copyright (c) Crackerjack Project., 2007 + * Ported from Crackerjack to LTP by Manas Kumar Nayak maknayak@in.ibm.com> + */ + +/*\ + * [Description] + * + * Basic tests for the tkill errors. * - * Description: This tests the tkill() syscall + * [Algorithm] * - * History: Porting from Crackerjack to LTP is done by - * Manas Kumar Nayak maknayak@in.ibm.com> + * - EINVAL on an invalid thread ID + * - ESRCH when no process with the specified thread ID exists */ #include @@ -32,66 +22,35 @@ #include #include -#include "test.h" #include "lapi/syscalls.h" +#include "tst_test.h" -char *TCID = "tkill02"; -int testno; - +static pid_t expired_pid; static pid_t inval_tid = -1; -static pid_t unused_tid; - -void cleanup(void) -{ - tst_rmdir(); -} - -void setup(void) -{ - TEST_PAUSE; - tst_tmpdir(); - - unused_tid = tst_get_unused_pid(cleanup); -} struct test_case_t { int *tid; int exp_errno; -} test_cases[] = { - {&inval_tid, EINVAL}, - {&unused_tid, ESRCH} + const char *desc; +} tc[] = { + {&inval_tid, EINVAL, "inval_tid"}, + {&expired_pid, ESRCH, "expired_pid"} }; -int TST_TOTAL = sizeof(test_cases) / sizeof(test_cases[0]); - -int main(int ac, char **av) +static void setup(void) { - int i; - - setup(); - - tst_parse_opts(ac, av, NULL, NULL); - - for (i = 0; i < TST_TOTAL; i++) { - - TEST(ltp_syscall(__NR_tkill, *(test_cases[i].tid), SIGUSR1)); + expired_pid = tst_get_unused_pid(); +} - if (TEST_RETURN == -1) { - if (TEST_ERRNO == test_cases[i].exp_errno) { - tst_resm(TPASS | TTERRNO, - "tkill(%d, SIGUSR1) failed as expected", - *(test_cases[i].tid)); - } else { - tst_brkm(TFAIL | TTERRNO, cleanup, - "tkill(%d, SIGUSR1) failed unexpectedly", - *(test_cases[i].tid)); - } - } else { - tst_brkm(TFAIL, cleanup, - "tkill(%d) succeeded unexpectedly", - *(test_cases[i].tid)); - } - } - cleanup(); - tst_exit(); +static void run(unsigned int i) +{ + TST_EXP_FAIL(tst_syscall(__NR_tkill, *(tc[i].tid), SIGUSR1), + tc[i].exp_errno, "tst_syscall(__NR_tkill, %s)", tc[i].desc); } + +static struct tst_test test = { + .tcnt = ARRAY_SIZE(tc), + .needs_tmpdir = 1, + .setup = setup, + .test = run, +};