Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3DE3DC433EF for ; Tue, 26 Oct 2021 05:29:27 +0000 (UTC) Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4AF0760F92 for ; Tue, 26 Oct 2021 05:29:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 4AF0760F92 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=uniontech.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.linux.it Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 3A4D53C6766 for ; Tue, 26 Oct 2021 07:29:24 +0200 (CEST) Received: from in-4.smtp.seeweb.it (in-4.smtp.seeweb.it [IPv6:2001:4b78:1:20::4]) (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 D801F3C015A for ; Tue, 26 Oct 2021 07:29:10 +0200 (CEST) Received: from smtpbgau2.qq.com (smtpbgau2.qq.com [54.206.34.216]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by in-4.smtp.seeweb.it (Postfix) with ESMTPS id 8C8B61001281 for ; Tue, 26 Oct 2021 07:29:02 +0200 (CEST) X-QQ-mid: bizesmtp40t1635226136tha4l269 Received: from localhost.localdomain (unknown [58.240.82.166]) by esmtp6.qq.com (ESMTP) with id ; Tue, 26 Oct 2021 13:28:51 +0800 (CST) X-QQ-SSF: 0140000000200020B000000A0000000 X-QQ-FEAT: rCzLTtzQ0gfVtpyJXT7QlDxqIwrwBAJ3JDtZuEDi07fJuuaZDvL9yJ46Qy+nJ N1opTOlhw09qcZNUuBtv/InIcHvUkjPR0uQ88wps2KvqUsjV8AVOViDfy7xzefjTGZm1ese CEv2Vnnn1k30Yw4S43pO9Cn/7dfsoyQnDHDix9+XWCP2jL45N9uySpZ9e+k/RzH1+y5wr2t QIZ2QdBY1uRU2DHLUsi7CPaVq1huy70MJUvoIyLILjbSxOvMFmC+VlSX27f7bOvvaX4Oil2 zlk5XKJIls0Bkhcb2XIfltiDKcmJ/TtJp/7TMEbQO9Fm6X8vuOmuLooiCZ5hmfKY/6mq9Eu Qq5f0EvPOEdqJ+aEwkBDSarADZ2Yg== X-QQ-GoodBg: 2 From: tangmeng To: ltp@lists.linux.it Date: Tue, 26 Oct 2021 13:28:49 +0800 Message-Id: <20211026052849.25944-1-tangmeng@uniontech.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:uniontech.com:qybgforeign:qybgforeign1 X-QQ-Bgrelay: 1 X-Virus-Scanned: clamav-milter 0.102.4 at in-4.smtp.seeweb.it X-Virus-Status: Clean Subject: [LTP] [PATCH v3] link/link02: Convert to 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: , Cc: tangmeng Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ltp-bounces+ltp=archiver.kernel.org@lists.linux.it Sender: "ltp" Signed-off-by: tangmeng --- testcases/kernel/syscalls/link/link02.c | 112 ++++++------------------ 1 file changed, 26 insertions(+), 86 deletions(-) diff --git a/testcases/kernel/syscalls/link/link02.c b/testcases/kernel/syscalls/link/link02.c index 6ac340c72..3d265d6eb 100644 --- a/testcases/kernel/syscalls/link/link02.c +++ b/testcases/kernel/syscalls/link/link02.c @@ -1,56 +1,20 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2000 Silicon Graphics, Inc. All Rights Reserved. * AUTHOR : William Roske * CO-PILOT : Dave Fenner * Copyright (c) 2014 Cyril Hrubis - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it would be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * Further, this software is distributed without any warranty that it is - * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or - * otherwise, applies only to this software file. Patent licenses, if - * any, provided herein do not apply to combinations of this program with - * other software, or any other product whatsoever. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, - * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * - * http://oss.sgi.com/projects/GenInfo/NoticeExplan/ */ -/* - * Tests that link(2) succeds. +/*\ + * [Description] + * + * Tests that link(2) succeeds. */ -#include -#include +#include #include -#include -#include -#include -#include "test.h" -#include "safe_macros.h" - -static void setup(void); -static void cleanup(void); - -char *TCID = "link02"; -int TST_TOTAL = 1; +#include "tst_test.h" #define OLDPATH "oldpath" #define NEWPATH "newpath" @@ -59,57 +23,33 @@ static void verify_link(void) { struct stat fbuf, lbuf; - TEST(link(OLDPATH, NEWPATH)); + TST_EXP_PASS(link(OLDPATH, NEWPATH)); - if (TEST_RETURN == 0) { - SAFE_STAT(cleanup, OLDPATH, &fbuf); - SAFE_STAT(cleanup, NEWPATH, &lbuf); - if (fbuf.st_nlink > 1 && lbuf.st_nlink > 1 && - fbuf.st_nlink == lbuf.st_nlink) { - tst_resm(TPASS, "link("OLDPATH","NEWPATH") " - "returned 0 and link counts match"); - } else { - tst_resm(TFAIL, "link("OLDPATH","NEWPATH") returned 0" - " but stat lin count do not match %d %d", - (int)fbuf.st_nlink, (int)lbuf.st_nlink); - } - SAFE_UNLINK(cleanup, NEWPATH); - } else { - tst_resm(TFAIL | TTERRNO, - "link("OLDPATH","NEWPATH") returned %ld", - TEST_RETURN); - } -} - -int main(int ac, char **av) -{ - int lc; - - tst_parse_opts(ac, av, NULL, NULL); + if (!TST_PASS) + return; - setup(); + SAFE_STAT(OLDPATH, &fbuf); + SAFE_STAT(NEWPATH, &lbuf); - for (lc = 0; TEST_LOOPING(lc); lc++) { - tst_count = 0; - verify_link(); + if (fbuf.st_nlink > 1 && fbuf.st_nlink == lbuf.st_nlink) { + tst_res(TPASS, "link("OLDPATH","NEWPATH") " + "returned 0 and stat link counts match"); + } else { + tst_res(TFAIL, "link("OLDPATH","NEWPATH") returned 0" + " but stat link counts do not match %d %d", + (int)fbuf.st_nlink, (int)lbuf.st_nlink); } - cleanup(); - tst_exit(); + SAFE_UNLINK(NEWPATH); } static void setup(void) { - tst_sig(NOFORK, DEF_HANDLER, cleanup); - - TEST_PAUSE; - - tst_tmpdir(); - - SAFE_TOUCH(cleanup, OLDPATH, 0700, NULL); + SAFE_TOUCH(OLDPATH, 0700, NULL); } -static void cleanup(void) -{ - tst_rmdir(); -} +static struct tst_test test = { + .test_all = verify_link, + .setup = setup, + .needs_tmpdir = 1, +}; -- 2.20.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp