Re: [LTP] [PATCH v3 7/9] Rewrite rename07.c using new LTP API

[Richard Palethorpe <rpalethorpe@suse.de>]

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/rename07.c | 171 ++++----------------
>  1 file changed, 30 insertions(+), 141 deletions(-)
>
> diff --git a/testcases/kernel/syscalls/rename/rename07.c b/testcases/kernel/syscalls/rename/rename07.c
> index 5b95f84bb..51338dbf4 100644
> --- a/testcases/kernel/syscalls/rename/rename07.c
> +++ b/testcases/kernel/syscalls/rename/rename07.c
> @@ -1,154 +1,43 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /*
> - * NAME
> - *	rename07
> - *
> - * DESCRIPTION
> - *	This test will verify that rename(2) failed in ENOTDIR
> - *
> - * CALLS
> - *	stat,open,rename,mkdir,close
> - *
> - * ALGORITHM
> - *	Setup:
> - *		Setup signal handling.
> - *		Create temporary directory.
> - *		Pause for SIGUSR1 if option specified.
> - *              create the "old" directory and the "new" file
> - *              rename the "old" directory to the "new" file
> - *
> - *	Test:
> - *		Loop if the proper options are given.
> - *                  verify rename() failed and returned ENOTDIR
> - *
> - *	Cleanup:
> - *		Print errno log and/or timing stats if options given
> - *		Delete the temporary directory created.*
> - * USAGE
> - *	rename07 [-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.
> + * Copyright (c) International Business Machines  Corp., 2001
> + *  07/2001 Ported by Wayne Boyer
> + * Copyright (c) 2022 SUSE LLC Avinesh Kumar <avinesh.kumar@suse.com>
> + */
> +
> +/*\
> + * [Description]
>   *
> - * HISTORY
> - *	07/2001 Ported by Wayne Boyer
> + * Verify that rename(2) fails with ENOTDIR, when
> + * oldpath is a directory and newpath exists but is not a directory.
>   *
> - * RESTRICTIONS
> - *	None.
>   */
> -#include <sys/types.h>
> -#include <fcntl.h>
> -#include <sys/stat.h>
> -#include <unistd.h>
> -#include <errno.h>
> -
> -#include "test.h"
> -#include "safe_macros.h"
> -
> -void setup();
> -void cleanup();
>  
> -char *TCID = "rename07";
> -int TST_TOTAL = 1;
> +#include <stdio.h>
> +#include "tst_test.h"
>  
> -int fd;
> -char mname[255], fdir[255];
> -struct stat buf1, buf2;
> -dev_t olddev, olddev1;
> -ino_t oldino, oldino1;
> +#define MNT_POINT "mntpoint"
> +#define TEMP_DIR "tmpdir"
> +#define TEMP_FILE "tmpfile"
>  
> -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;
> -
> -		/* rename a directory to a file */
> -		/* Call rename(2) */
> -		TEST(rename(fdir, mname));
> -
> -		if (TEST_RETURN != -1) {
> -			tst_resm(TFAIL, "rename(%s, %s) succeeded unexpectedly",
> -				 fdir, mname);
> -			continue;
> -		}
> -
> -		if (TEST_ERRNO != ENOTDIR) {
> -			tst_resm(TFAIL, "Expected ENOTDIR got %d", TEST_ERRNO);
> -		} else {
> -			tst_resm(TPASS, "rename() returned ENOTDIR");
> -		}
> -	}
> -
> -	cleanup();
> -	tst_exit();
> -
> +	SAFE_CHDIR(MNT_POINT);
> +	SAFE_MKDIR(TEMP_DIR, 00770);
> +	SAFE_TOUCH(TEMP_FILE, 0700, NULL);
>  }
>  
> -/*
> - * 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(fdir, "./rndir_%d", getpid());
> -	sprintf(mname, "./tfile_%d", getpid());
> -
> -	/* create "old" directory */
> -	if (stat(fdir, &buf1) != -1) {
> -		tst_brkm(TBROK, cleanup, "tmp directory %s found!", fdir);
> -	}
> -
> -	SAFE_MKDIR(cleanup, fdir, 00770);
> -
> -	SAFE_STAT(cleanup, fdir, &buf1);
> -
> -	/* save "old"'s dev and ino */
> -	olddev = buf1.st_dev;
> -	oldino = buf1.st_ino;
> -
> -	SAFE_TOUCH(cleanup, mname, 0700, NULL);
> -
> -	SAFE_STAT(cleanup, mname, &buf2);
> -
> -	/* save "new"'s dev and ino */
> -	olddev1 = buf2.st_dev;
> -	oldino1 = buf2.st_ino;
> +	TST_EXP_FAIL(rename(TEMP_DIR, TEMP_FILE),
> +				ENOTDIR);
>  }
>  
> -/*
> - * cleanup() - performs all ONE TIME cleanup for this test at
> - *              completion or premature exit.
> - */
> -void cleanup(void)
> -{
> -
> -	/*
> -	 * Remove the temporary directory.
> -	 */
> -	tst_rmdir();
> -}
> +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.

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp