* [LTP] [PATCH] rename13.c: Convert to new LTP API
@ 2022-07-25 17:38 Avinesh Kumar
2022-07-26 9:09 ` Richard Palethorpe
0 siblings, 1 reply; 2+ messages in thread
From: Avinesh Kumar @ 2022-07-25 17:38 UTC (permalink / raw)
To: ltp
Rewrite test using new LTP API and enable on all supporting filesystems
Signed-off-by: Avinesh Kumar <akumar@suse.de>
---
testcases/kernel/syscalls/rename/rename13.c | 206 ++++----------------
1 file changed, 37 insertions(+), 169 deletions(-)
diff --git a/testcases/kernel/syscalls/rename/rename13.c b/testcases/kernel/syscalls/rename/rename13.c
index 07a90c4d1..51490db75 100644
--- a/testcases/kernel/syscalls/rename/rename13.c
+++ b/testcases/kernel/syscalls/rename/rename13.c
@@ -1,186 +1,54 @@
+// 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
+ * 07/2001 Ported by Wayne Boyer
+ * Copyright (c) 2022 SUSE LLC Avinesh Kumar <avinesh.kumar@suse.com>
*/
-/*
- * NAME
- * rename13
- *
- * DESCRIPTION
- * Verify rename() return successfully and performs no other action
- * when "old" file and "new" file link to the same file.
- *
- * ALGORITHM
- * Setup:
- * Setup signal handling.
- * Create temporary directory.
- * Pause for SIGUSR1 if option specified.
- *
- * Test:
- * Loop if the proper options are given.
- * create the "old" file
- * link the "new" file to the "old" file
- * rename the "old" to the "new" file
- * verify the "new" file points to the original file
- * verify the "old" file exists and points to
- * the original file
- * Cleanup:
- * Print errno log and/or timing stats if options given
- * Delete the temporary directory created.
- *
- * USAGE
- * rename13 [-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
+/*\
+ * [Description]
*
- * RESTRICTIONS
- * None.
+ * Verify that rename() does nothing and returns a success status when
+ * oldpath and newpath are existing hard links referring to the same file.
*/
-#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_FILE1 MNT_POINT"/tmpfile1"
+#define TEMP_FILE2 MNT_POINT"/tmpfile2"
-char *TCID = "rename13";
-int TST_TOTAL = 1;
+static struct stat buf1, buf2;
-int fd;
-char fname[255], mname[255];
-struct stat buf1, buf2;
-dev_t olddev;
-ino_t oldino;
-
-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;
-
- /*
- * TEST rename()works when
- * both old file and new file link to the same file
- */
-
- /* Call rename(2) */
- TEST(rename(fname, mname));
-
- if (TEST_RETURN == -1) {
- tst_resm(TFAIL, "rename(%s, %s) failed", fname, mname);
- continue;
- }
-
- /* check the existence of "new", and get the status */
- SAFE_STAT(cleanup, mname, &buf2);
-
- /* check the existence of "old", and get the status */
- SAFE_STAT(cleanup, fname, &buf1);
-
- /* verify the new file is the same as the original */
- if (buf2.st_dev != olddev || buf2.st_ino != oldino) {
- tst_resm(TFAIL,
- "rename() failed: new file does "
- "not point to the same file as old "
- "file");
- continue;
- }
-
- /* verify the old file is unchanged */
- if (buf1.st_dev != olddev || buf1.st_ino != oldino) {
- tst_resm(TFAIL,
- "rename() failed: old file does "
- "not point to the original file");
- continue;
- }
-
- tst_resm(TPASS, "functionality of rename() is correct");
- }
-
- cleanup();
- tst_exit();
+ SAFE_TOUCH(TEMP_FILE1, 0700, NULL);
+ SAFE_STAT(TEMP_FILE1, &buf1);
+ SAFE_LINK(TEMP_FILE1, TEMP_FILE2);
}
-/*
- * setup() - performs all ONE TIME setup for this test.
- */
-void setup(void)
+static void run(void)
{
+ TST_EXP_PASS(rename(TEMP_FILE1, TEMP_FILE1));
+ if (TST_RET != 0)
+ return;
- 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());
-
- SAFE_TOUCH(cleanup, fname, 0700, NULL);
-
- SAFE_STAT(cleanup, fname, &buf1);
-
- /* save the dev and inode */
- olddev = buf1.st_dev;
- oldino = buf1.st_ino;
-
- /* link the "new" file to the "old" file */
- SAFE_LINK(cleanup, fname, mname);
+ SAFE_STAT(TEMP_FILE2, &buf2);
+ TST_EXP_EQ_LU(buf1.st_dev, buf2.st_dev);
+ TST_EXP_EQ_LU(buf1.st_ino, buf2.st_ino);
}
-/*
- * 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,
+ .mntpoint = MNT_POINT,
+ .mount_device = 1,
+ .all_filesystems = 1,
+ .skip_filesystems = (const char *const[]){
+ "exfat",
+ "vfat",
+ NULL
+ },
+};
--
2.36.1
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [LTP] [PATCH] rename13.c: Convert to new LTP API
2022-07-25 17:38 [LTP] [PATCH] rename13.c: Convert to new LTP API Avinesh Kumar
@ 2022-07-26 9:09 ` Richard Palethorpe
0 siblings, 0 replies; 2+ messages in thread
From: Richard Palethorpe @ 2022-07-26 9:09 UTC (permalink / raw)
To: Avinesh Kumar; +Cc: ltp
Hello,
Reviewed-by: Richard Palethorpe <rpalethorpe@suse.com>
Avinesh Kumar <akumar@suse.de> writes:
> Rewrite test using new LTP API and enable on all supporting filesystems
>
> Signed-off-by: Avinesh Kumar <akumar@suse.de>
> ---
> testcases/kernel/syscalls/rename/rename13.c | 206 ++++----------------
> 1 file changed, 37 insertions(+), 169 deletions(-)
>
> diff --git a/testcases/kernel/syscalls/rename/rename13.c b/testcases/kernel/syscalls/rename/rename13.c
> index 07a90c4d1..51490db75 100644
> --- a/testcases/kernel/syscalls/rename/rename13.c
> +++ b/testcases/kernel/syscalls/rename/rename13.c
> @@ -1,186 +1,54 @@
> +// 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
> + * 07/2001 Ported by Wayne Boyer
> + * Copyright (c) 2022 SUSE LLC Avinesh Kumar <avinesh.kumar@suse.com>
> */
>
> -/*
> - * NAME
> - * rename13
> - *
> - * DESCRIPTION
> - * Verify rename() return successfully and performs no other action
> - * when "old" file and "new" file link to the same file.
> - *
> - * ALGORITHM
> - * Setup:
> - * Setup signal handling.
> - * Create temporary directory.
> - * Pause for SIGUSR1 if option specified.
> - *
> - * Test:
> - * Loop if the proper options are given.
> - * create the "old" file
> - * link the "new" file to the "old" file
> - * rename the "old" to the "new" file
> - * verify the "new" file points to the original file
> - * verify the "old" file exists and points to
> - * the original file
> - * Cleanup:
> - * Print errno log and/or timing stats if options given
> - * Delete the temporary directory created.
> - *
> - * USAGE
> - * rename13 [-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
> +/*\
> + * [Description]
> *
> - * RESTRICTIONS
> - * None.
> + * Verify that rename() does nothing and returns a success status when
> + * oldpath and newpath are existing hard links referring to the same file.
> */
> -#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_FILE1 MNT_POINT"/tmpfile1"
> +#define TEMP_FILE2 MNT_POINT"/tmpfile2"
>
> -char *TCID = "rename13";
> -int TST_TOTAL = 1;
> +static struct stat buf1, buf2;
>
> -int fd;
> -char fname[255], mname[255];
> -struct stat buf1, buf2;
> -dev_t olddev;
> -ino_t oldino;
> -
> -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;
> -
> - /*
> - * TEST rename()works when
> - * both old file and new file link to the same file
> - */
> -
> - /* Call rename(2) */
> - TEST(rename(fname, mname));
> -
> - if (TEST_RETURN == -1) {
> - tst_resm(TFAIL, "rename(%s, %s) failed", fname, mname);
> - continue;
> - }
> -
> - /* check the existence of "new", and get the status */
> - SAFE_STAT(cleanup, mname, &buf2);
> -
> - /* check the existence of "old", and get the status */
> - SAFE_STAT(cleanup, fname, &buf1);
> -
> - /* verify the new file is the same as the original */
> - if (buf2.st_dev != olddev || buf2.st_ino != oldino) {
> - tst_resm(TFAIL,
> - "rename() failed: new file does "
> - "not point to the same file as old "
> - "file");
> - continue;
> - }
> -
> - /* verify the old file is unchanged */
> - if (buf1.st_dev != olddev || buf1.st_ino != oldino) {
> - tst_resm(TFAIL,
> - "rename() failed: old file does "
> - "not point to the original file");
> - continue;
> - }
> -
> - tst_resm(TPASS, "functionality of rename() is correct");
> - }
> -
> - cleanup();
> - tst_exit();
> + SAFE_TOUCH(TEMP_FILE1, 0700, NULL);
> + SAFE_STAT(TEMP_FILE1, &buf1);
> + SAFE_LINK(TEMP_FILE1, TEMP_FILE2);
> }
>
> -/*
> - * setup() - performs all ONE TIME setup for this test.
> - */
> -void setup(void)
> +static void run(void)
> {
> + TST_EXP_PASS(rename(TEMP_FILE1, TEMP_FILE1));
> + if (TST_RET != 0)
> + return;
>
> - 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());
> -
> - SAFE_TOUCH(cleanup, fname, 0700, NULL);
> -
> - SAFE_STAT(cleanup, fname, &buf1);
> -
> - /* save the dev and inode */
> - olddev = buf1.st_dev;
> - oldino = buf1.st_ino;
> -
> - /* link the "new" file to the "old" file */
> - SAFE_LINK(cleanup, fname, mname);
> + SAFE_STAT(TEMP_FILE2, &buf2);
> + TST_EXP_EQ_LU(buf1.st_dev, buf2.st_dev);
> + TST_EXP_EQ_LU(buf1.st_ino, buf2.st_ino);
> }
>
> -/*
> - * 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,
> + .mntpoint = MNT_POINT,
> + .mount_device = 1,
> + .all_filesystems = 1,
> + .skip_filesystems = (const char *const[]){
> + "exfat",
> + "vfat",
> + NULL
> + },
> +};
> --
> 2.36.1
--
Thank you,
Richard.
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-07-26 9:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-25 17:38 [LTP] [PATCH] rename13.c: Convert to new LTP API Avinesh Kumar
2022-07-26 9:09 ` Richard Palethorpe
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.