Add renameat.h to encapsulate renameat syscall.
Delete some useless comments.
Use some SAFE_* macros.
Move the test body from main() to (*testfunc[])().
Signed-off-by: Xing Gu <gux.f...@cn.fujitsu.com>
---
configure.ac | 1 +
include/lapi/fcntl.h | 4 +
m4/ltp-renameat.m4 | 25 ++
testcases/kernel/syscalls/renameat/renameat.h | 37 +++
testcases/kernel/syscalls/renameat/renameat01.c | 348 +++++++++++-------------
5 files changed, 232 insertions(+), 183 deletions(-)
create mode 100644 m4/ltp-renameat.m4
create mode 100644 testcases/kernel/syscalls/renameat/renameat.h
diff --git a/configure.ac b/configure.ac
index 9f397e7..bf888c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -178,5 +178,6 @@ LTP_CHECK_FCHOWNAT
LTP_CHECK_MKNODAT
LTP_CHECK_FALLOCATE
LTP_CHECK_SYSCALL_FCNTL
+LTP_CHECK_RENAMEAT
AC_OUTPUT
diff --git a/include/lapi/fcntl.h b/include/lapi/fcntl.h
index 85188a0..ca086b2 100644
--- a/include/lapi/fcntl.h
+++ b/include/lapi/fcntl.h
@@ -59,4 +59,8 @@
# define FALLOC_FL_KEEP_SIZE 1
#endif
+#ifndef AT_REMOVEDIR
+# define AT_REMOVEDIR 0x200
+#endif
+
#endif /* __LAPI_FCNTL_H__ */
diff --git a/m4/ltp-renameat.m4 b/m4/ltp-renameat.m4
new file mode 100644
index 0000000..f40c58e
--- /dev/null
+++ b/m4/ltp-renameat.m4
@@ -0,0 +1,25 @@
+dnl
+dnl Copyright (c) Linux Test Project, 2014
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
+dnl the GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software Foundation,
+dnl Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+dnl
+
+dnl
+dnl LTP_CHECK_RENAMEAT
+dnl ----------------------------
+dnl
+AC_DEFUN([LTP_CHECK_RENAMEAT],[
+AC_CHECK_FUNCS(renameat,,)
+])
diff --git a/testcases/kernel/syscalls/renameat/renameat.h
b/testcases/kernel/syscalls/renameat/renameat.h
new file mode 100644
index 0000000..fa1e2e5
--- /dev/null
+++ b/testcases/kernel/syscalls/renameat/renameat.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) International Business Machines Corp., 2007
+ * Copyright (c) 2014 Fujitsu Ltd.
+ *
+ * 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 Library 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#ifndef RENAMEAT_H
+#define RENAMEAT_H
+
+#include <sys/types.h>
+#include "config.h"
+#include "linux_syscall_numbers.h"
+
+#if !defined(HAVE_RENAMEAT)
+int renameat(int olddirfd, const char *oldpath, int newdirfd,
+ const char *newpath)
+{
+ return ltp_syscall(__NR_renameat, olddirfd, oldpath, newdirfd,
+ newpath);
+}
+#endif
+
+#endif /* RENAMEAT_H */
diff --git a/testcases/kernel/syscalls/renameat/renameat01.c
b/testcases/kernel/syscalls/renameat/renameat01.c
index e27e344..bc08477 100644
--- a/testcases/kernel/syscalls/renameat/renameat01.c
+++ b/testcases/kernel/syscalls/renameat/renameat01.c
@@ -1,46 +1,31 @@
-/******************************************************************************
+/*
+ * Copyright (c) International Business Machines Corp., 2006
+ * 08/24/2006 Created first by Yi Yang <yyang...@cn.ibm.com>
*
- * Copyright (c) International Business Machines Corp., 2006
+ * 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 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.
*
- * 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
- *
- * NAME
- * renameat01.c
- *
- * DESCRIPTION
- * This test case will verify basic function of renameat
- * added by kernel 2.6.16 or up.
- *
- * USAGE: <for command-line>
- * renameat01 [-c n] [-e] [-i n] [-I x] [-P x] [-t] [-p]
- * where:
- * -c n : Run n copies simultaneously.
- * -e : Turn on errno logging.
- * -i n : Execute test n times.
- * -I x : Execute test for x seconds.
- * -p : Pause for SIGUSR1 before starting
- * -P x : Pause for x seconds between iterations.
- * -t : Turn on syscall timing.
- *
- * Author
- * Yi Yang <yyang...@cn.ibm.com>
- *
- * History
- * 08/24/2006 Created first by Yi Yang <yyang...@cn.ibm.com>
- *
- *****************************************************************************/
+ * 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
+ */
+/*
+ * Description:
+ * Verify that,
+ * 1) renameat(2) returns -1 and sets errno to ENOTDIR if oldpath
+ * is relative and olddirfd is a file descriptor referring to
+ * a file other than a directory, or similar for newpath and
+ * newdirfd.
+ * 2) renameat(2) returns -1 and sets errno to EBADF if olddirfd
+ * or newdirfd is not a valid file descriptor.
+ */
#define _GNU_SOURCE
@@ -53,193 +38,190 @@
#include <errno.h>
#include <string.h>
#include <signal.h>
+
#include "test.h"
#include "usctest.h"
+#include "safe_macros.h"
#include "linux_syscall_numbers.h"
-
-#define TEST_CASES 5
-#ifndef AT_FDCWD
-#define AT_FDCWD -100
-#endif
-#ifndef AT_REMOVEDIR
-#define AT_REMOVEDIR 0x200
-#endif
-
-void setup();
-void cleanup();
-void setup_every_copy();
+#include "lapi/fcntl.h"
+#include "renameat.h"
+
+#define DIR_MODE (S_IRWXU | S_IRWXG | S_IRWXO)
+#define FILE_MODE (S_IRWXU | S_IRWXG | S_IRWXO)
+
+#define TESTDIR "testdir"
+#define NEW_TESTDIR "newtestdir"
+#define TESTFILE "testfile"
+#define NEW_TESTFILE "newtestfile"
+#define TESTFILE2 "testdir/testfile"
+#define NEW_TESTFILE2 "newtestdir/newtestfile"
+#define TESTFILE3 "/tmp/testfile3"
+#define NEW_TESTFILE3 "/tmp/newtestfile3"
+
+static void setup(void);
+static void cleanup(void);
+static void test_success1(void);
+static void test_success2(void);
+static void test_success3(void);
+static void test_enotdir(void);
+static void test_ebadf(void);
+static void check_and_print(int expected_errno);
+
+static void (*testfunc[])(void) = { test_success1, test_success2,
+ test_success3, test_enotdir, test_ebadf };
char *TCID = "renameat01";
-int TST_TOTAL = TEST_CASES;
-char pathname[256];
-char dpathname[256];
-char testfile[256];
-char dtestfile[256];
-char testfile2[256];
-char dtestfile2[256];
-char testfile3[256];
-char dtestfile3[256];
-int olddirfd, newdirfd, fd, ret;
-int oldfds[TEST_CASES], newfds[TEST_CASES];
-char *oldfilenames[TEST_CASES], *newfilenames[TEST_CASES];
-int expected_errno[TEST_CASES] = { 0, 0, ENOTDIR, EBADF, 0 };
-
-int myrenameat(int olddirfd, const char *oldfilename, int newdirfd,
- const char *newfilename)
-{
- return ltp_syscall(__NR_renameat, olddirfd, oldfilename, newdirfd,
- newfilename);
-}
+int TST_TOTAL = ARRAY_SIZE(testfunc);
+static int exp_enos[] = { ENOTDIR, EBADF, 0 };
int main(int ac, char **av)
{
- int lc;
char *msg;
- int i;
-
- /* Disable test if the version of the kernel is less than 2.6.16 */
- if ((tst_kvercmp(2, 6, 16)) < 0) {
- tst_brkm(TCONF, NULL,
- "This test can only run on kernels that are 2.6.16 and
higher");
- }
+ int i, lc;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
+ msg = parse_opts(ac, av, NULL, NULL);
+ if (msg != NULL)
tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
setup();
- for (lc = 0; TEST_LOOPING(lc); lc++) {
- setup_every_copy();
+ TEST_EXP_ENOS(exp_enos);
+ for (lc = 0; TEST_LOOPING(lc); lc++) {
tst_count = 0;
- /*
- * Call renameat
- */
- for (i = 0; i < TST_TOTAL; i++) {
- TEST(myrenameat
- (oldfds[i], oldfilenames[i], newfds[i],
- newfilenames[i]));
-
- /* check return code */
- if (TEST_ERRNO == expected_errno[i]) {
-
- if (STD_FUNCTIONAL_TEST) {
- /* No Verification test, yet... */
- tst_resm(TPASS | TTERRNO,
- "renameat failed as expected");
- }
- } else {
- tst_resm(TFAIL | TTERRNO,
- "renameat failed unexpectedly");
- }
- }
-
+ for (i = 0; i < TST_TOTAL; i++)
+ (*testfunc[i])();
}
cleanup();
-
tst_exit();
}
-void setup_every_copy(void)
+static void setup(void)
{
- /* Initialize test dir and file names */
- sprintf(pathname, "renameattestdir%d", getpid());
- sprintf(dpathname, "drenameattestdir%d", getpid());
- sprintf(testfile, "renameattestfile%d.txt", getpid());
- sprintf(dtestfile, "drenameattestfile%d.txt", getpid());
- sprintf(testfile2, "renameattestdir%d/renameattestfile%d.txt", getpid(),
- getpid());
- sprintf(dtestfile2, "drenameattestdir%d/drenameattestfile%d.txt",
- getpid(), getpid());
- sprintf(testfile3, "/tmp/renameattestfile%d.txt", getpid());
- sprintf(dtestfile3, "/tmp/drenameattestfile%d.txt", getpid());
-
- ret = mkdir(pathname, 0700);
- if (ret < 0) {
- perror("mkdir: ");
- exit(-1);
+ if ((tst_kvercmp(2, 6, 16)) < 0) {
+ tst_brkm(TCONF, NULL,
+ "This test can only run on kernels that are "
+ "2.6.16 and higher");
}
- ret = mkdir(dpathname, 0700);
- if (ret < 0) {
- perror("mkdir: ");
- exit(-1);
- }
+ tst_sig(NOFORK, DEF_HANDLER, cleanup);
- olddirfd = open(pathname, O_DIRECTORY);
- if (olddirfd < 0) {
- perror("open: ");
- exit(-1);
- }
+ tst_tmpdir();
- newdirfd = open(dpathname, O_DIRECTORY);
- if (newdirfd < 0) {
- perror("open: ");
- exit(-1);
- }
+ TEST_PAUSE;
- fd = open(testfile, O_CREAT | O_RDWR, 0600);
- if (fd < 0) {
- perror("open: ");
- exit(-1);
- }
+ SAFE_TOUCH(cleanup, TESTFILE, FILE_MODE, NULL);
+
+ SAFE_MKDIR(cleanup, TESTDIR, DIR_MODE);
+ SAFE_TOUCH(cleanup, TESTFILE2, FILE_MODE, NULL);
+ SAFE_MKDIR(cleanup, NEW_TESTDIR, DIR_MODE);
- fd = open(testfile2, O_CREAT | O_RDWR, 0600);
- if (fd < 0) {
- perror("open: ");
- exit(-1);
+ SAFE_TOUCH(cleanup, TESTFILE3, FILE_MODE, NULL);
+}
+
+static void test_success1(void)
+{
+ TEST(renameat(AT_FDCWD, TESTFILE, AT_FDCWD, NEW_TESTFILE));
+ check_and_print(0);
+
+ if (TEST_RETURN == 0) {
+ if (renameat(AT_FDCWD, NEW_TESTFILE, AT_FDCWD,
+ TESTFILE) == -1) {
+ tst_brkm(TBROK | TERRNO, cleanup, "restore test "
+ "environment: renameat(%d, %s, %d, %s) failed.",
+ AT_FDCWD, NEW_TESTFILE, AT_FDCWD, TESTFILE);
+ }
}
+}
+
+static void test_success2(void)
+{
+ int olddirfd, newdirfd;
+
+ olddirfd = SAFE_OPEN(cleanup, TESTDIR, O_DIRECTORY);
+ newdirfd = SAFE_OPEN(cleanup, NEW_TESTDIR, O_DIRECTORY);
- fd = open(testfile3, O_CREAT | O_RDWR, 0600);
- if (fd < 0) {
- perror("open: ");
- exit(-1);
+ TEST(renameat(olddirfd, TESTFILE, newdirfd, NEW_TESTFILE));
+ check_and_print(0);
+
+ if (TEST_RETURN == 0) {
+ if (renameat(newdirfd, NEW_TESTFILE, olddirfd,
+ TESTFILE) == -1) {
+ tst_brkm(TBROK | TERRNO, cleanup, "restore test "
+ "environment: renameat(%d, %s, %d, %s) failed.",
+ newdirfd, NEW_TESTFILE, olddirfd, TESTFILE);
+ }
}
- oldfds[0] = oldfds[1] = olddirfd;
- oldfds[2] = fd;
- oldfds[3] = 100;
- oldfds[4] = AT_FDCWD;
+ if (close(olddirfd) == -1)
+ tst_resm(TWARN | TERRNO, "close(%d) failed", olddirfd);
- newfds[0] = newfds[1] = newdirfd;
- newfds[2] = fd;
- newfds[3] = 100;
- newfds[4] = AT_FDCWD;
+ if (close(newdirfd) == -1)
+ tst_resm(TWARN | TERRNO, "close(%d) failed", newdirfd);
+}
- oldfilenames[0] = oldfilenames[2] = oldfilenames[3] = oldfilenames[4] =
- testfile;
- oldfilenames[1] = testfile3;
+static void test_success3(void)
+{
+ int olddirfd, newdirfd;
- newfilenames[0] = newfilenames[2] = newfilenames[3] = newfilenames[4] =
- dtestfile;
- newfilenames[1] = dtestfile3;
+ olddirfd = SAFE_OPEN(cleanup, TESTDIR, O_DIRECTORY);
+ newdirfd = SAFE_OPEN(cleanup, NEW_TESTDIR, O_DIRECTORY);
+
+ TEST(renameat(olddirfd, TESTFILE3, newdirfd, NEW_TESTFILE3));
+ check_and_print(0);
+
+ if (TEST_RETURN == 0) {
+ if (renameat(newdirfd, NEW_TESTFILE3, olddirfd,
+ TESTFILE3) == -1) {
+ tst_brkm(TBROK | TERRNO, cleanup, "restore test "
+ "environment: renameat(%d, %s, %d, %s) failed.",
+ newdirfd, NEW_TESTFILE3, olddirfd, TESTFILE3);
+ }
+ }
+
+ if (close(olddirfd) == -1)
+ tst_resm(TWARN | TERRNO, "close(%d) failed", olddirfd);
+
+ if (close(newdirfd) == -1)
+ tst_resm(TWARN | TERRNO, "close(%d) failed", newdirfd);
}
-void setup(void)
+static void test_enotdir(void)
{
+ int notdirfd;
- tst_sig(NOFORK, DEF_HANDLER, cleanup);
+ notdirfd = SAFE_OPEN(cleanup, TESTFILE3, O_RDWR);
- TEST_PAUSE;
+ TEST(renameat(notdirfd, TESTFILE, notdirfd, NEW_TESTFILE));
+ check_and_print(ENOTDIR);
+
+ if (close(notdirfd) == -1)
+ tst_resm(TWARN | TERRNO, "close(%d) failed", notdirfd);
+}
+
+static void test_ebadf(void)
+{
+ TEST(renameat(100, TESTFILE, 100, NEW_TESTFILE));
+ check_and_print(EBADF);
}
-void cleanup(void)
+static void check_and_print(int expected_errno)
+{
+ if (TEST_ERRNO == expected_errno) {
+ tst_resm(TPASS | TTERRNO,
+ "renameat() returned the expected value");
+ } else {
+ tst_resm(TFAIL | TTERRNO,
+ "renameat() got unexpected return value; expected: "
+ "%d - %s", expected_errno, strerror(expected_errno));
+ }
+}
+
+static void cleanup(void)
{
- /* Remove them */
- unlink(testfile2);
- unlink(dtestfile2);
- unlink(testfile3);
- unlink(dtestfile3);
- unlink(testfile);
- unlink(dtestfile);
- rmdir(pathname);
- rmdir(dpathname);
-
- /*
- * print timing stats if that option was specified.
- * print errno log if that option was specified.
- */
TEST_CLEANUP;
+
+ tst_rmdir();
}
--
1.9.0
------------------------------------------------------------------------------
Start Your Social Network Today - Download eXo Platform
Build your Enterprise Intranet with eXo Platform Software
Java Based Open Source Intranet - Social, Extensible, Cloud Ready
Get Started Now And Turn Your Intranet Into A Collaboration Platform
http://p.sf.net/sfu/ExoPlatform
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
