[LTP] [PATCH 4/9] Rewrite rename04.c using new LTP API
Avinesh Kumar
akumar@suse.de
Wed Jun 22 09:01:32 CEST 2022
Signed-off-by: Avinesh Kumar <akumar@suse.de>
---
testcases/kernel/syscalls/rename/rename04.c | 201 ++++----------------
1 file changed, 33 insertions(+), 168 deletions(-)
diff --git a/testcases/kernel/syscalls/rename/rename04.c b/testcases/kernel/syscalls/rename/rename04.c
index 32594a776..5aca0654e 100644
--- a/testcases/kernel/syscalls/rename/rename04.c
+++ b/testcases/kernel/syscalls/rename/rename04.c
@@ -1,182 +1,47 @@
+// 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
- * rename04
- *
- * DESCRIPTION
- * This test will verify that rename(2) failed when newpath is
- * a non-empty directory and return EEXIST or ENOTEMPTY
- *
- * ALGORITHM
- * Setup:
- * Setup signal handling.
- * Create temporary directory.
- * Pause for SIGUSR1 if option specified.
- * create the "old" directory and the "new" directory
- * create a file uner the "new" directory
- *
- * Test:
- * Loop if the proper options are given.
- * rename the "old" to the "new" directory
- * verify rename() failed and returned ENOTEMPTY
- *
- * Cleanup:
- * Print errno log and/or timing stats if options given
- * Delete the temporary directory created.
- *
- * USAGE
- * rename04 [-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() fails and errno is set to EEXIST or ENOTEMPTY when
+ * newpath is a non-empty 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 DIR1 "dir1"
+#define DIR2 "dir2"
+#define TEMP_FILE DIR2"/tmpfile"
-char *TCID = "rename04";
-int TST_TOTAL = 1;
-
-int fd;
-char tstfile[40];
-char fdir[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;
-
- /* rename a directory to a non-empty directory */
-
- /* Call rename(2) */
- TEST(rename(fdir, mdir));
-
- if (TEST_RETURN != -1) {
- tst_resm(TFAIL, "rename(%s, %s) succeeded unexpectedly",
- fdir, mdir);
- continue;
- }
-
- if (TEST_ERRNO == ENOTEMPTY) {
- tst_resm(TPASS, "rename() returned ENOTEMPTY");
- } else if (TEST_ERRNO == EEXIST) {
- tst_resm(TPASS, "rename() returned EEXIST");
- } else {
- tst_resm(TFAIL, "Expected ENOTEMPTY or EEXIST got %d",
- TEST_ERRNO);
- }
-
- }
-
- /*
- * cleanup and exit
- */
- cleanup();
- tst_exit();
-
+ SAFE_MKDIR(DIR1, 00770);
+ SAFE_MKDIR(DIR2, 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, "./tdir_%d", getpid());
- sprintf(mdir, "./rndir_%d", getpid());
- sprintf(tstfile, "%s/tstfile_%d", mdir, getpid());
-
- /* create "old" directory */
- SAFE_MKDIR(cleanup, fdir, 00770);
-
- SAFE_STAT(cleanup, fdir, &buf1);
-
- /* save "old"'s dev and ino */
- olddev = buf1.st_dev;
- oldino = buf1.st_ino;
-
- /* create another directory */
- SAFE_MKDIR(cleanup, mdir, 00770);
-
- SAFE_TOUCH(cleanup, tstfile, 0700, NULL);
-
- SAFE_STAT(cleanup, mdir, &buf2);
-
- /* save "new"'s dev and ino */
- olddev1 = buf2.st_dev;
- oldino1 = buf2.st_ino;
+ TEST(rename(DIR1, DIR2));
+
+ if (TST_RET == -1 && TST_ERR == ENOTEMPTY)
+ tst_res(TPASS, "rename() failed with ENOTEMPTY");
+ else if (TST_RET == -1 && TST_ERR == EEXIST)
+ tst_res(TPASS, "rename() failed with EEXIST");
+ else if (TST_RET == 0)
+ tst_res(TFAIL, "rename() succeeded unexpectedly");
+ else
+ tst_res(TFAIL, "rename() failed, but not with expected errno");
}
-/*
- * 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
More information about the ltp
mailing list