[LTP] [PATCH 1/2] syscalls/symlink02: Convert to new API
Li Wang
liwang@redhat.com
Fri Oct 20 08:23:18 CEST 2023
On Fri, Oct 20, 2023 at 11:25 AM Yang Xu <xuyang2018.jy@fujitsu.com> wrote:
> The original test didn't produce any output results.
> Use tst_macro to enable test to produce output results.
>
> Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
> ---
> testcases/kernel/syscalls/symlink/symlink02.c | 222 +++---------------
> 1 file changed, 32 insertions(+), 190 deletions(-)
>
> diff --git a/testcases/kernel/syscalls/symlink/symlink02.c
> b/testcases/kernel/syscalls/symlink/symlink02.c
> index c18db2b37..aa0c25d9f 100644
> --- a/testcases/kernel/syscalls/symlink/symlink02.c
> +++ b/testcases/kernel/syscalls/symlink/symlink02.c
> @@ -1,208 +1,50 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> /*
> * Copyright (c) 2000 Silicon Graphics, Inc. All Rights Reserved.
> - *
> - * 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/
> - *
> + * Copyright (c) Linux Test Project, 2003-2023
> + * Author: William Roske
> */
> -/* $Id: symlink02.c,v 1.6 2009/08/28 14:17:14 vapier Exp $ */
> -/**********************************************************
> - *
> - * OS Test - Silicon Graphics, Inc.
> - *
> - * TEST IDENTIFIER : symlink02
> - *
> - * EXECUTED BY : anyone
> - *
> - * TEST TITLE : Basic test for symlink(2)
> - *
> - * PARENT DOCUMENT : usctpl01
> - *
> - * TEST CASE TOTAL : 1
> - *
> - * WALL CLOCK TIME : 1
> - *
> - * CPU TYPES : ALL
> - *
> - * AUTHOR : William Roske
> - *
> - * CO-PILOT : Dave Fenner
> - *
> - * DATE STARTED : 03/30/92
> - *
> - * INITIAL RELEASE : UNICOS 7.0
> - *
> - * TEST CASES
> - *
> - * 1.) symlink(2) returns...(See Description)
> - *
> - * INPUT SPECIFICATIONS
> - * The standard options for system call tests are accepted.
> - * (See the parse_opts(3) man page).
> - *
> - * OUTPUT SPECIFICATIONS
> - *$
> - * DURATION
> - * Terminates - with frequency and infinite modes.
> - *
> - * SIGNALS
> - * Uses SIGUSR1 to pause before test if option set.
> - * (See the parse_opts(3) man page).
> - *
> - * RESOURCES
> - * None
> - *
> - * ENVIRONMENTAL NEEDS
> - * No run-time environmental needs.
> - *
> - * SPECIAL PROCEDURAL REQUIREMENTS
> - * None
> - *
> - * INTERCASE DEPENDENCIES
> - * None
> - *
> - * DETAILED DESCRIPTION
> - * This is a Phase I test for the symlink(2) system call. It is
> intended
> - * to provide a limited exposure of the system call, for now. It
> - * should/will be extended when full functional tests are written for
> - * symlink(2).
> - *
> - * Setup:
> - * Setup signal handling.
> - * Pause for SIGUSR1 if option specified.
> - *
> - * Test:
> - * Loop if the proper options are given.
> - * Execute system call
> - * Check return code, if system call failed (return=-1)
> - * Log the errno and Issue a FAIL message.
> - * Otherwise, Issue a PASS message.
> - *
> - * Cleanup:
> - * Print errno log and/or timing stats if options given
> - *
> - *
> - *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
>
> -#include <sys/types.h>
> -#include <fcntl.h>
> -#include <errno.h>
> -#include <string.h>
> -#include <signal.h>
> -#include "test.h"
> -#include "safe_macros.h"
> -
> -void setup();
> -void cleanup();
> +/*\
> + * [Description]
> + *
> + * Check the basic functionality of the symlink() system call.
> + */
>
> -char *TCID = "symlink02";
> -int TST_TOTAL = 1;
> +#include "tst_test.h"
>
> -char fname[255], symlnk[255];
> -int fd;
> +static char *fname, *symlnk;
> +static int fd;
>
the fd is unnecessary in the test.
> -int main(int ac, char **av)
> +static void verify_symlink(void)
> {
> - int lc;
> -
> - /***************************************************************
> - * parse standard options
> - ***************************************************************/
> - tst_parse_opts(ac, av, NULL, NULL);
> -
> - /***************************************************************
> - * perform global setup for test
> - ***************************************************************/
> - setup();
> -
> - /***************************************************************
> - * check looping state if -c option given
> - ***************************************************************/
> - for (lc = 0; TEST_LOOPING(lc); lc++) {
> -
> - tst_count = 0;
> -
> - /*
> - * Call symlink(2)
> - */
> - TEST(symlink(fname, symlnk));
> -
> - /* check return code */
> - if (TEST_RETURN == -1) {
> - tst_resm(TFAIL, "symlink(%s, %s) Failed, errno=%d
> : %s",
> - fname, symlnk, TEST_ERRNO,
> - strerror(TEST_ERRNO));
> - } else {
> - SAFE_UNLINK(cleanup, symlnk);
> - }
> - }
> -
> - /***************************************************************
> - * cleanup and exit
> - ***************************************************************/
> - cleanup();
> - tst_exit();
> + TST_EXP_POSITIVE(symlink(fname, symlnk), "symlink(%s, %s)",
> + fname, symlnk);
>
> + if (TST_RET == -1)
> + tst_res(TFAIL, "symlink(%s, %s) Failed", fname, symlnk);
> + else
> + SAFE_UNLINK(symlnk);
> }
>
> -/***************************************************************
> - * setup() - performs all ONE TIME setup for this test.
> - ***************************************************************/
> -void setup(void)
> +static void setup(void)
> {
> + fname = tst_aprintf("tfile_%d", getpid());
>
> - tst_sig(NOFORK, DEF_HANDLER, cleanup);
> + fd = SAFE_OPEN(fname, O_RDWR | O_CREAT, 0700);
>
Why do we need save the fd here, I didn't see any places make use of it.
Otherwise patchset looks good to me.
Reviewed-by: Li Wang <liwang@redhat.com>
>
> - TEST_PAUSE;
> -
> - tst_tmpdir();
> -
> - sprintf(fname, "tfile_%d", getpid());
> - if ((fd = open(fname, O_RDWR | O_CREAT, 0700)) == -1) {
> - tst_brkm(TBROK, cleanup,
> - "open(%s, O_RDWR|O_CREAT,0700) Failed, errno=%d :
> %s",
> - fname, errno, strerror(errno));
> - }
> -
> - if (close(fd) == -1) {
> - tst_resm(TWARN, "close(%s) Failed, errno=%d : %s",
> - fname, errno, strerror(errno));
> - }
> - sprintf(symlnk, "st_%d", getpid());
> + symlnk = tst_aprintf("st_%d", getpid());
> }
>
> -/***************************************************************
> - * cleanup() - performs all ONE TIME cleanup for this test at
> - * completion or premature exit.
> - ***************************************************************/
> -void cleanup(void)
> +static void cleanup(void)
>
remove the cleanup function.
> {
> -
> - tst_rmdir();
> -
> + if (fd > -1)
> + SAFE_CLOSE(fd);
> }
> +
> +static struct tst_test test = {
> + .needs_tmpdir = 1,
> + .setup = setup,
> + .cleanup = cleanup,
> + .test_all = verify_symlink,
> +};
> --
> 2.39.1
>
>
> --
> Mailing list info: https://lists.linux.it/listinfo/ltp
>
>
--
Regards,
Li Wang
More information about the ltp
mailing list