Reviewed-by: Richard Palethorpe <rpalethorpe@suse.com>
Avinesh Kumar <akumar@suse.de> writes:
> Rewrite using new LTP API and enable all filesystems
>
> Signed-off-by: Avinesh Kumar <akumar@suse.de>
> ---
> testcases/kernel/syscalls/rename/rename05.c | 193 +++-----------------
> 1 file changed, 28 insertions(+), 165 deletions(-)
>
> diff --git a/testcases/kernel/syscalls/rename/rename05.c b/testcases/kernel/syscalls/rename/rename05.c
> index db10720fe..7894a9214 100644
> --- a/testcases/kernel/syscalls/rename/rename05.c
> +++ b/testcases/kernel/syscalls/rename/rename05.c
> @@ -1,179 +1,42 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> /*
> - *
> - * Copyright (c) International Business Machines Corp., 2001
> - *
> - * 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
> + * Copyright (c) International Business Machines Corp., 2001
> + * 07/2001 Ported by Wayne Boyer
> + * Copyright (c) 2022 SUSE LLC Avinesh Kumar <avinesh.kumar@suse.com>
> */
>
> -/*
> - * NAME
> - * rename05
> - *
> - * DESCRIPTION
> - * This test will verify that rename(2) fails with EISDIR
> - *
> - * ALGORITHM
> - * Setup:
> - * Setup signal handling.
> - * Create temporary directory.
> - * Pause for SIGUSR1 if option specified.
> - * create the "old" file and the "new" directory
> - * rename the "old" file to the "new" directory
> - *
> - * Test:
> - * Loop if the proper options are given.
> - * verify rename() failed and returned EISDIR
> - *
> - * Cleanup:
> - * Print errno log and/or timing stats if options given
> - * Delete the temporary directory created.
> - *
> - * USAGE
> - * rename05 [-c n] [-e] [-i n] [-I x] [-P x] [-t]
> - * where, -c n : Run n copies concurrently.
> - * -e : Turn on errno logging.
> - * -i n : Execute test n times.
> - * -I x : Execute test for x seconds.
> - * -P x : Pause for x seconds between iterations.
> - * -t : Turn on syscall timing.
> - *
> - * HISTORY
> - * 07/2001 Ported by Wayne Boyer
> +/*\
> + * [Description]
> *
> - * RESTRICTIONS
> - * None.
> + * Verify that rename(2) fails with EISDIR when
> + * oldpath is not a directory and newpath is an existing directory.
> */
> -#include <sys/types.h>
> -#include <fcntl.h>
> -#include <sys/stat.h>
> -#include <unistd.h>
> -#include <errno.h>
>
> -#include "test.h"
> -#include "safe_macros.h"
> +#include <stdio.h>
> +#include "tst_test.h"
>
> -void setup();
> -void cleanup();
> +#define MNT_POINT "mntpoint"
> +#define TEMP_FILE "tmpfile"
> +#define TEMP_DIR "tmpdir"
>
> -char *TCID = "rename05";
> -int TST_TOTAL = 1;
> -
> -int fd;
> -char fname[255], mdir[255];
> -struct stat buf1, buf2;
> -dev_t olddev, olddev1;
> -ino_t oldino, oldino1;
> -
> -int main(int ac, char **av)
> +static void setup(void)
> {
> - int lc;
> -
> - /*
> - * parse standard options
> - */
> - tst_parse_opts(ac, av, NULL, NULL);
> -
> - /*
> - * perform global setup for test
> - */
> - setup();
> -
> - /*
> - * check looping state if -i option given
> - */
> - for (lc = 0; TEST_LOOPING(lc); lc++) {
> -
> - tst_count = 0;
> -
> - /* attempt to rename a file to a directory */
> - /* Call rename(2) */
> - TEST(rename(fname, mdir));
> -
> - if (TEST_RETURN != -1) {
> - tst_resm(TFAIL, "rename(%s, %s) succeed unexpected",
> - fname, mdir);
> - continue;
> - }
> -
> - if (errno != EISDIR) {
> - tst_resm(TFAIL, "Expected EISDIR got %d", TEST_ERRNO);
> - } else {
> - tst_resm(TPASS, "rename() returned EISDIR");
> - }
> - }
> -
> - /*
> - * cleanup and exit
> - */
> - cleanup();
> - tst_exit();
> -
> + SAFE_CHDIR(MNT_POINT);
> + SAFE_TOUCH(TEMP_FILE, 0700, NULL);
> + SAFE_MKDIR(TEMP_DIR, 00770);
> }
>
> -/*
> - * setup() - performs all ONE TIME setup for this test.
> - */
> -void setup(void)
> +static void run(void)
> {
> -
> - tst_sig(NOFORK, DEF_HANDLER, cleanup);
> -
> - TEST_PAUSE;
> -
> - /* Create a temporary directory and make it current. */
> - tst_tmpdir();
> -
> - sprintf(mdir, "./rndir_%d", getpid());
> - sprintf(fname, "./tfile_%d", getpid());
> -
> - /* create "old" file */
> - SAFE_TOUCH(cleanup, fname, 0700, NULL);
> - SAFE_STAT(cleanup, fname, &buf1);
> -
> - /* save "old"'s dev and ino */
> - olddev = buf1.st_dev;
> - oldino = buf1.st_ino;
> -
> - /* create another directory */
> - if (stat(mdir, &buf2) != -1) {
> - tst_brkm(TBROK, cleanup, "tmp directory %s found!", mdir);
> - }
> -
> - SAFE_MKDIR(cleanup, mdir, 00770);
> -
> - SAFE_STAT(cleanup, mdir, &buf2);
> -
> - /* save "new"'s dev and ino */
> - olddev1 = buf2.st_dev;
> - oldino1 = buf2.st_ino;
> + TST_EXP_FAIL(rename(TEMP_FILE, TEMP_DIR),
> + EISDIR);
> }
>
> -/*
> - * cleanup() - performs all ONE TIME cleanup for this test at
> - * completion or premature exit.
> - */
> -void cleanup(void)
> -{
> -
> - /*
> - * Remove the temporary directory.
> - */
> - tst_rmdir();
> -
> - /*
> - * Exit with return code appropriate for results.
> - */
> -
> -}
> +static struct tst_test test = {
> + .setup = setup,
> + .test_all = run,
> + .needs_root = 1,
> + .mount_device = 1,
> + .mntpoint = MNT_POINT,
> + .all_filesystems = 1
> +};
> --
> 2.36.1
--
Thank you,
Richard.