| Message ID | 20220622070137.24286-2-akumar@suse.de |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Simplify and convert some of rename tests to new LTP API | expand |
Hi! > +/*\ > + * [DESCRIPTION] ^ Description > * > - * ALGORITHM > - * Setup: > - * Setup signal handling. > - * Create temporary directory. > - * Pause for SIGUSR1 if option specified. > - * > - * Test: > - * Loop if the proper options are given. > - * 1. "old" is plain file, new does not exists > - * create the "old" file, make sure the "new" file > - * dose not exist > - * rename the "old" to the "new" file > - * verify the "new" file points to the "old" file > - * verify the "old" file does not exist > - * > - * 2. "old" is a directory,"new" does not exists > - * create the "old" directory, make sure "new" > - * dose not exist > - * rename the "old" to the "new" > - * verify the "new" points to the "old" > - * verify the "old" does not exist > - * Cleanup: > - * Print errno log and/or timing stats if options given > - * Delete the temporary directory created. > - * > - * USAGE > - * rename01 [-c n] [-f] [-i n] [-I x] [-P x] [-t] > - * where, -c n : Run n copies concurrently. > - * -f : Turn off functionality Testing. > - * -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 > - * > - * RESTRICTIONS > - * None. > + * Verify rename() when the newpath file or directory does not exist. > */ > -#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 = "rename01"; > -int TST_TOTAL = 2; > +#include <sys/stat.h> > +#include <stdio.h> > +#include "tst_test.h" > > -char fname[255], mname[255]; > -char fdir[255], mdir[255]; > -struct stat buf1; > -dev_t f_olddev, d_olddev; > -ino_t f_oldino, d_oldino; > +#define OLD_FILE_NAME "oldfile" > +#define NEW_FILE_NAME "newfile" > +#define OLD_DIR_NAME "olddir" > +#define NEW_DIR_NAME "newdir" > > -struct test_case_t { > - char *name1; > - char *name2; > - char *desc; > - dev_t *olddev; > - ino_t *oldino; > -} TC[] = { > - /* comment goes here */ > - { > - fname, mname, "file", &f_olddev, &f_oldino}, > - /* comment goes here */ > - { > - fdir, mdir, "directory", &d_olddev, &d_oldino} > -}; > +static struct stat old_file_st, old_dir_st, new_file_st, new_dir_st; > > -int main(int ac, char **av) > +static void setup(void) > { > - int lc; > - int i; > - > - /* > - * 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; > - > - /* loop through the test cases */ > - for (i = 0; i < TST_TOTAL; i++) { > - > - TEST(rename(TC[i].name1, TC[i].name2)); > - > - if (TEST_RETURN == -1) { > - tst_resm(TFAIL, "call failed unexpectedly"); > - continue; > - } > - > - SAFE_STAT(cleanup, TC[i].name2, &buf1); > - > - /* > - * verify the new file or directory is the > - * same as the old one > - */ > - if (buf1.st_dev != *TC[i].olddev || > - buf1.st_ino != *TC[i].oldino) { > - tst_resm(TFAIL, "rename() failed: the " > - "new %s points to a different " > - "inode/location", TC[i].desc); > - continue; > - } > - /* > - * verify that the old file or directory > - * does not exist > - */ > - if (stat(fname, &buf1) != -1) { > - tst_resm(TFAIL, "the old %s still " > - "exists", TC[i].desc); > - continue; > - } > - > - tst_resm(TPASS, "functionality is correct " > - "for renaming a %s", TC[i].desc); > - } > - /* reset things in case we are looping */ > - SAFE_RENAME(cleanup, mname, fname); > - > - SAFE_RENAME(cleanup, mdir, fdir); This was there for a reason, the test now fails with -i 2 I guess that better solution would be swapping the old and new directory pointers after each iteration as: static const char *old_file_name = "oldfile"; static const char *old_dir_name = "olddir"; static const char *new_file_name = "newfile"; static const char *new_dir_name = "newdir"; #define SWAP(a, b) do { \ const char *tmp__ = a; \ a = b; \ b = tmp__; \ } while (0) static void run(void) { ... SWAP(old_file_name, new_file_name); SWAP(old_dir_name, new_dir_name); } > - } > - > - cleanup(); > - tst_exit(); > + SAFE_TOUCH(OLD_FILE_NAME, 0700, NULL); > + SAFE_MKDIR(OLD_DIR_NAME, 00770); > > + SAFE_STAT(OLD_FILE_NAME, &old_file_st); > + SAFE_STAT(OLD_DIR_NAME, &old_dir_st); > } > > -/* > - * 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(fname, "./tfile_%d", getpid()); > - sprintf(mname, "./rnfile_%d", getpid()); > - sprintf(fdir, "./tdir_%d", getpid()); > - sprintf(mdir, "./rndir_%d", getpid()); > - > - SAFE_TOUCH(cleanup, fname, 0700, NULL); > - > - SAFE_STAT(cleanup, fname, &buf1); > - > - f_olddev = buf1.st_dev; > - f_oldino = buf1.st_ino; > - > - /* create "old" directory */ > - SAFE_MKDIR(cleanup, fdir, 00770); > - > - SAFE_STAT(cleanup, fdir, &buf1); > - > - d_olddev = buf1.st_dev; > - d_oldino = buf1.st_ino; > + TST_EXP_PASS(rename(OLD_FILE_NAME, NEW_FILE_NAME), > + "rename(%s, %s)", > + OLD_FILE_NAME, NEW_FILE_NAME); > + TST_EXP_PASS(rename(OLD_DIR_NAME, NEW_DIR_NAME), > + "rename(%s, %s)", > + OLD_DIR_NAME, NEW_DIR_NAME); It would be better to do return; if either of the renames had failed, i.e. to add after each: if (!TST_PASS) return; > + SAFE_STAT(NEW_FILE_NAME, &new_file_st); > + SAFE_STAT(NEW_DIR_NAME, &new_dir_st); > + > + TST_EXP_EQ_LI(old_file_st.st_dev, new_file_st.st_dev); > + TST_EXP_EQ_LI(old_file_st.st_ino, new_file_st.st_ino); > + > + TST_EXP_EQ_LI(old_dir_st.st_dev, new_dir_st.st_dev); > + TST_EXP_EQ_LI(old_dir_st.st_ino, new_dir_st.st_ino); > + > + TST_EXP_FAIL(stat(OLD_FILE_NAME, &old_file_st), > + ENOENT, > + "stat(%s, &old_file_st)", > + OLD_FILE_NAME); > + TST_EXP_FAIL(stat(OLD_DIR_NAME, &old_dir_st), > + ENOENT, > + "stat(%s, &old_dir_st)", > + OLD_DIR_NAME); > } > > -/* > - * 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_tmpdir = 1 > +}; > -- > 2.36.1 > > > -- > Mailing list info: https://lists.linux.it/listinfo/ltp
diff --git a/testcases/kernel/syscalls/rename/rename01.c b/testcases/kernel/syscalls/rename/rename01.c index e7de18ff4..803ce0e4b 100644 --- a/testcases/kernel/syscalls/rename/rename01.c +++ b/testcases/kernel/syscalls/rename/rename01.c @@ -1,218 +1,66 @@ +// 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 - * rename01 - * - * DESCRIPTION - * This test will verify the rename(2) syscall basic functionality. - * Verify rename() works when the "new" file or directory does not exist. +/*\ + * [DESCRIPTION] * - * ALGORITHM - * Setup: - * Setup signal handling. - * Create temporary directory. - * Pause for SIGUSR1 if option specified. - * - * Test: - * Loop if the proper options are given. - * 1. "old" is plain file, new does not exists - * create the "old" file, make sure the "new" file - * dose not exist - * rename the "old" to the "new" file - * verify the "new" file points to the "old" file - * verify the "old" file does not exist - * - * 2. "old" is a directory,"new" does not exists - * create the "old" directory, make sure "new" - * dose not exist - * rename the "old" to the "new" - * verify the "new" points to the "old" - * verify the "old" does not exist - * Cleanup: - * Print errno log and/or timing stats if options given - * Delete the temporary directory created. - * - * USAGE - * rename01 [-c n] [-f] [-i n] [-I x] [-P x] [-t] - * where, -c n : Run n copies concurrently. - * -f : Turn off functionality Testing. - * -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 - * - * RESTRICTIONS - * None. + * Verify rename() when the newpath file or directory does not exist. */ -#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 = "rename01"; -int TST_TOTAL = 2; +#include <sys/stat.h> +#include <stdio.h> +#include "tst_test.h" -char fname[255], mname[255]; -char fdir[255], mdir[255]; -struct stat buf1; -dev_t f_olddev, d_olddev; -ino_t f_oldino, d_oldino; +#define OLD_FILE_NAME "oldfile" +#define NEW_FILE_NAME "newfile" +#define OLD_DIR_NAME "olddir" +#define NEW_DIR_NAME "newdir" -struct test_case_t { - char *name1; - char *name2; - char *desc; - dev_t *olddev; - ino_t *oldino; -} TC[] = { - /* comment goes here */ - { - fname, mname, "file", &f_olddev, &f_oldino}, - /* comment goes here */ - { - fdir, mdir, "directory", &d_olddev, &d_oldino} -}; +static struct stat old_file_st, old_dir_st, new_file_st, new_dir_st; -int main(int ac, char **av) +static void setup(void) { - int lc; - int i; - - /* - * 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; - - /* loop through the test cases */ - for (i = 0; i < TST_TOTAL; i++) { - - TEST(rename(TC[i].name1, TC[i].name2)); - - if (TEST_RETURN == -1) { - tst_resm(TFAIL, "call failed unexpectedly"); - continue; - } - - SAFE_STAT(cleanup, TC[i].name2, &buf1); - - /* - * verify the new file or directory is the - * same as the old one - */ - if (buf1.st_dev != *TC[i].olddev || - buf1.st_ino != *TC[i].oldino) { - tst_resm(TFAIL, "rename() failed: the " - "new %s points to a different " - "inode/location", TC[i].desc); - continue; - } - /* - * verify that the old file or directory - * does not exist - */ - if (stat(fname, &buf1) != -1) { - tst_resm(TFAIL, "the old %s still " - "exists", TC[i].desc); - continue; - } - - tst_resm(TPASS, "functionality is correct " - "for renaming a %s", TC[i].desc); - } - /* reset things in case we are looping */ - SAFE_RENAME(cleanup, mname, fname); - - SAFE_RENAME(cleanup, mdir, fdir); - } - - cleanup(); - tst_exit(); + SAFE_TOUCH(OLD_FILE_NAME, 0700, NULL); + SAFE_MKDIR(OLD_DIR_NAME, 00770); + SAFE_STAT(OLD_FILE_NAME, &old_file_st); + SAFE_STAT(OLD_DIR_NAME, &old_dir_st); } -/* - * 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(fname, "./tfile_%d", getpid()); - sprintf(mname, "./rnfile_%d", getpid()); - sprintf(fdir, "./tdir_%d", getpid()); - sprintf(mdir, "./rndir_%d", getpid()); - - SAFE_TOUCH(cleanup, fname, 0700, NULL); - - SAFE_STAT(cleanup, fname, &buf1); - - f_olddev = buf1.st_dev; - f_oldino = buf1.st_ino; - - /* create "old" directory */ - SAFE_MKDIR(cleanup, fdir, 00770); - - SAFE_STAT(cleanup, fdir, &buf1); - - d_olddev = buf1.st_dev; - d_oldino = buf1.st_ino; + TST_EXP_PASS(rename(OLD_FILE_NAME, NEW_FILE_NAME), + "rename(%s, %s)", + OLD_FILE_NAME, NEW_FILE_NAME); + TST_EXP_PASS(rename(OLD_DIR_NAME, NEW_DIR_NAME), + "rename(%s, %s)", + OLD_DIR_NAME, NEW_DIR_NAME); + + SAFE_STAT(NEW_FILE_NAME, &new_file_st); + SAFE_STAT(NEW_DIR_NAME, &new_dir_st); + + TST_EXP_EQ_LI(old_file_st.st_dev, new_file_st.st_dev); + TST_EXP_EQ_LI(old_file_st.st_ino, new_file_st.st_ino); + + TST_EXP_EQ_LI(old_dir_st.st_dev, new_dir_st.st_dev); + TST_EXP_EQ_LI(old_dir_st.st_ino, new_dir_st.st_ino); + + TST_EXP_FAIL(stat(OLD_FILE_NAME, &old_file_st), + ENOENT, + "stat(%s, &old_file_st)", + OLD_FILE_NAME); + TST_EXP_FAIL(stat(OLD_DIR_NAME, &old_dir_st), + ENOENT, + "stat(%s, &old_dir_st)", + OLD_DIR_NAME); } -/* - * 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_tmpdir = 1 +};
Signed-off-by: Avinesh Kumar <akumar@suse.de> --- testcases/kernel/syscalls/rename/rename01.c | 252 ++++---------------- 1 file changed, 50 insertions(+), 202 deletions(-)