[LTP] [PATCH 1/4] link/link04: Convert to new API
Li Wang
liwang@redhat.com
Tue Nov 2 10:18:30 CET 2021
Hi Meng,
On Fri, Oct 29, 2021 at 4:06 PM tangmeng <tangmeng@uniontech.com> wrote:
> Signed-off-by: tangmeng <tangmeng@uniontech.com>
> ---
> testcases/kernel/syscalls/link/link04.c | 140 +++++-------------------
> 1 file changed, 29 insertions(+), 111 deletions(-)
>
> diff --git a/testcases/kernel/syscalls/link/link04.c
> b/testcases/kernel/syscalls/link/link04.c
> index d9408845e..acc8a7134 100644
> --- a/testcases/kernel/syscalls/link/link04.c
> +++ b/testcases/kernel/syscalls/link/link04.c
> @@ -1,65 +1,32 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> /*
> * Copyright (c) 2000 Silicon Graphics, Inc. All Rights Reserved.
> * AUTHOR : Richard Logan
> * CO-PILOT : William Roske
> * Copyright (c) 2014 Cyril Hrubis <chrubis@suse.cz>
> - *
> - * 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/
> - *
> */
>
> -/*
> +/*\
> + * [Description]
> + *
> * Negative test cases for link(2).
> *
> * This test program should contain test cases where link will fail
> regardless
> * of who executed it (i.e. joe-user or root)
> */
> -#include <sys/types.h>
> -#include <fcntl.h>
> -#include <sys/stat.h>
> -#include <errno.h>
> -#include <string.h>
> -#include <signal.h>
> #include <sys/param.h>
> #include <sys/mman.h>
> -#include "test.h"
> -#include "safe_macros.h"
> +#include "tst_test.h"
>
> static char longpath[PATH_MAX + 2];
>
> -struct test_case_t {
> +struct tcase_t {
> char *file1;
> char *desc1;
> char *file2;
> char *desc2;
> int exp_errno;
> -} test_cases[] = {
> +} tcases[] = {
> /* first path is invalid */
> {"nonexistfile", "non-existent file", "nefile", "nefile", ENOENT},
> {"", "path is empty string", "nefile", "nefile", ENOENT},
> @@ -81,90 +48,41 @@ struct test_case_t {
> {"regfile", "regfile", "regfile2", "regfile2", EEXIST},
> };
>
> -char *TCID = "link04";
> -int TST_TOTAL = ARRAY_SIZE(test_cases);
> +static unsigned int TST_TOTAL = ARRAY_SIZE(tcases);
>
There is no need to define an extra global variable for the test loop.
LTP itself has already supported that to traversing tcase by .tcnt.
For your reference:
https://github.com/linux-test-project/ltp/blob/master/testcases/kernel/syscalls/madvise/madvise01.c#L117
>
> -static void setup(void);
> -static void cleanup(void);
> -
> -int main(int ac, char **av)
> +static void verify_link(void)
> {
> - int lc;
> - char *fname1, *fname2;
> - char *desc1, *desc2;
> - int i;
> -
> - tst_parse_opts(ac, av, NULL, NULL);
> -
> - setup();
> -
> - for (lc = 0; TEST_LOOPING(lc); lc++) {
> -
> - tst_count = 0;
> -
> - for (i = 0; i < TST_TOTAL; i++) {
> -
> - fname1 = test_cases[i].file1;
> - desc1 = test_cases[i].desc1;
> - fname2 = test_cases[i].file2;
> - desc2 = test_cases[i].desc2;
> -
> - TEST(link(fname1, fname2));
> -
> - if (TEST_RETURN == -1) {
> - if (TEST_ERRNO == test_cases[i].exp_errno)
> {
> - tst_resm(TPASS | TTERRNO,
> - "link(<%s>, <%s>)",
> - desc1, desc2);
> - } else {
> - tst_resm(TFAIL | TTERRNO,
> - "link(<%s>, <%s>) Failed "
> - "expected errno: %d",
> - desc1, desc2,
> - test_cases[i].exp_errno);
> - }
> - } else {
> - tst_resm(TFAIL,
> - "link(<%s>, <%s>) returned %ld, "
> - "expected -1, errno:%d",
> - desc1, desc2, TEST_RETURN,
> - test_cases[i].exp_errno);
> - }
> - }
> + unsigned int i;
>
> + for (i = 0; i < TST_TOTAL; i++) {
> + TST_EXP_FAIL(link(tcases[i].file1, tcases[i].file2),
> + tcases[i].exp_errno, "link(<%s>, <%s>)",
> + tcases[i].desc1, tcases[i].desc2);
> }
> -
> - cleanup();
> - tst_exit();
> }
>
> static void setup(void)
> {
> - int n;
> -
> - tst_sig(NOFORK, DEF_HANDLER, cleanup);
> -
> - TEST_PAUSE;
> -
> - tst_tmpdir();
> + unsigned int i;
>
> memset(longpath, 'a', PATH_MAX+1);
> - SAFE_TOUCH(cleanup, "regfile", 0777, NULL);
> - SAFE_TOUCH(cleanup, "regfile2", 0777, NULL);
> - SAFE_MKDIR(cleanup, "dir", 0777);
> + SAFE_TOUCH("regfile", 0777, NULL);
> + SAFE_TOUCH("regfile2", 0777, NULL);
> + SAFE_MKDIR("dir", 0777);
>
> - void *bad_addr = tst_get_bad_addr(cleanup);
> + void *bad_addr = tst_get_bad_addr(NULL);
>
> - for (n = 0; n < TST_TOTAL; n++) {
> - if (!test_cases[n].file1)
> - test_cases[n].file1 = bad_addr;
> + for (i = 0; i < TST_TOTAL; i++) {
> + if (!tcases[i].file1)
> + tcases[i].file1 = bad_addr;
>
> - if (!test_cases[n].file2)
> - test_cases[n].file2 = bad_addr;
> + if (!tcases[i].file2)
> + tcases[i].file2 = bad_addr;
> }
> }
>
> -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
>
>
--
Regards,
Li Wang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linux.it/pipermail/ltp/attachments/20211102/49dca736/attachment-0001.htm>
More information about the ltp
mailing list