* [LTP] [PATCH V3] syscall/renameat2: Add tests for renameat2
@ 2015-10-01 9:46 Cedric Hnyda
2015-10-05 15:34 ` Cyril Hrubis
0 siblings, 1 reply; 2+ messages in thread
From: Cedric Hnyda @ 2015-10-01 9:46 UTC (permalink / raw)
To: ltp
Added tests for the syscall renameat2.
Signed-off-by: chnyda <chnyda@suse.com>
---
configure.ac | 1 +
include/lapi/fcntl.h | 12 ++
m4/ltp-renameat2.m4 | 27 ++++
runtest/syscalls | 3 +
testcases/kernel/include/arm.in | 1 +
testcases/kernel/include/i386.in | 1 +
testcases/kernel/include/ia64.in | 1 +
testcases/kernel/include/powerpc.in | 1 +
testcases/kernel/include/powerpc64.in | 1 +
testcases/kernel/include/s390.in | 1 +
testcases/kernel/include/s390x.in | 1 +
testcases/kernel/include/sparc.in | 1 +
testcases/kernel/include/sparc64.in | 1 +
testcases/kernel/include/x86_64.in | 1 +
testcases/kernel/syscalls/.gitignore | 2 +
testcases/kernel/syscalls/renameat2/Makefile | 24 ++++
testcases/kernel/syscalls/renameat2/renameat2.h | 37 +++++
testcases/kernel/syscalls/renameat2/renameat201.c | 159 ++++++++++++++++++++++
testcases/kernel/syscalls/renameat2/renameat202.c | 156 +++++++++++++++++++++
19 files changed, 431 insertions(+)
create mode 100644 m4/ltp-renameat2.m4
create mode 100644 testcases/kernel/syscalls/renameat2/Makefile
create mode 100644 testcases/kernel/syscalls/renameat2/renameat2.h
create mode 100644 testcases/kernel/syscalls/renameat2/renameat201.c
create mode 100644 testcases/kernel/syscalls/renameat2/renameat202.c
diff --git a/configure.ac b/configure.ac
index ecea070..76c7628 100644
--- a/configure.ac
+++ b/configure.ac
@@ -165,6 +165,7 @@ LTP_CHECK_MKNODAT
LTP_CHECK_READLINKAT
LTP_CHECK_OPENAT
LTP_CHECK_RENAMEAT
+LTP_CHECK_RENAMEAT2
LTP_CHECK_FALLOCATE
LTP_CHECK_SYSCALL_FCNTL
LTP_CHECK_SYSCALL_PERF_EVENT_OPEN
diff --git a/include/lapi/fcntl.h b/include/lapi/fcntl.h
index 3667b5e..0661651 100644
--- a/include/lapi/fcntl.h
+++ b/include/lapi/fcntl.h
@@ -67,6 +67,18 @@
# define FALLOC_FL_KEEP_SIZE 1
#endif
+#ifndef RENAME_NOREPLACE
+# define RENAME_NOREPLACE (1 << 0)
+#endif
+
+#ifndef RENAME_EXCHANGE
+# define RENAME_EXCHANGE (1 << 1)
+#endif
+
+#ifndef RENAME_WHITEOUT
+# define RENAME_WHITEOUT (1 << 2)
+#endif
+
/* splice, vmsplice, tee */
#ifndef SPLICE_F_NONBLOCK
diff --git a/m4/ltp-renameat2.m4 b/m4/ltp-renameat2.m4
new file mode 100644
index 0000000..2bc7313
--- /dev/null
+++ b/m4/ltp-renameat2.m4
@@ -0,0 +1,27 @@
+dnl
+dnl Copyright (c) Linux Test Project, 2015
+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 Author: Cedric Hnyda <chnyda@suse.com>
+dnl
+
+dnl
+dnl LTP_CHECK_RENAMEAT2
+dnl ----------------------------
+dnl
+AC_DEFUN([LTP_CHECK_RENAMEAT2],[
+AC_CHECK_FUNCS(renameat2,,)
+])
diff --git a/runtest/syscalls b/runtest/syscalls
index 25d10ac..0d5fdb4 100644
--- a/runtest/syscalls
+++ b/runtest/syscalls
@@ -863,6 +863,9 @@ rename14 rename14
#renameat test cases
renameat01 renameat01
+renameat201 renameat201
+renameat202 renameat202
+
rmdir01 rmdir01
rmdir02 rmdir02
rmdir03 rmdir03
diff --git a/testcases/kernel/include/arm.in b/testcases/kernel/include/arm.in
index 841b064..eb130b7 100644
--- a/testcases/kernel/include/arm.in
+++ b/testcases/kernel/include/arm.in
@@ -333,4 +333,5 @@ accept4 (__NR_SYSCALL_BASE+366)
fanotify_init (__NR_SYSCALL_BASE+367)
fanotify_mark (__NR_SYSCALL_BASE+368)
prlimit64 (__NR_SYSCALL_BASE+369)
+renameat2 (__NR_SYSCALL_BASE+382)
getrandom (__NR_SYSCALL_BASE+384)
diff --git a/testcases/kernel/include/i386.in b/testcases/kernel/include/i386.in
index a4585c2..0e39902 100644
--- a/testcases/kernel/include/i386.in
+++ b/testcases/kernel/include/i386.in
@@ -333,4 +333,5 @@ recvmmsg 337
fanotify_init 338
fanotify_mark 339
prlimit64 340
+renameat2 354
getrandom 355
diff --git a/testcases/kernel/include/ia64.in b/testcases/kernel/include/ia64.in
index 4f8fb74..846141f 100644
--- a/testcases/kernel/include/ia64.in
+++ b/testcases/kernel/include/ia64.in
@@ -292,4 +292,5 @@ recvmmsg 1322
fanotify_init 1323
fanotify_mark 1324
prlimit64 1325
+renameat2 1338
getrandom 1339
diff --git a/testcases/kernel/include/powerpc.in b/testcases/kernel/include/powerpc.in
index 4025436..ef7469f 100644
--- a/testcases/kernel/include/powerpc.in
+++ b/testcases/kernel/include/powerpc.in
@@ -340,4 +340,5 @@ recvmsg 342
recvmmsg 343
accept4 344
syscalls 345
+renameat2 357
getrandom 359
diff --git a/testcases/kernel/include/powerpc64.in b/testcases/kernel/include/powerpc64.in
index 4025436..ef7469f 100644
--- a/testcases/kernel/include/powerpc64.in
+++ b/testcases/kernel/include/powerpc64.in
@@ -340,4 +340,5 @@ recvmsg 342
recvmmsg 343
accept4 344
syscalls 345
+renameat2 357
getrandom 359
diff --git a/testcases/kernel/include/s390.in b/testcases/kernel/include/s390.in
index 9c7cfa1..c97caa5 100644
--- a/testcases/kernel/include/s390.in
+++ b/testcases/kernel/include/s390.in
@@ -324,4 +324,5 @@ setgid 214
setfsuid 215
setfsgid 216
newfstatat 293
+renameat2 347
getrandom 349
diff --git a/testcases/kernel/include/s390x.in b/testcases/kernel/include/s390x.in
index 9c7cfa1..c97caa5 100644
--- a/testcases/kernel/include/s390x.in
+++ b/testcases/kernel/include/s390x.in
@@ -324,4 +324,5 @@ setgid 214
setfsuid 215
setfsgid 216
newfstatat 293
+renameat2 347
getrandom 349
diff --git a/testcases/kernel/include/sparc.in b/testcases/kernel/include/sparc.in
index 697378f..0c394f8 100644
--- a/testcases/kernel/include/sparc.in
+++ b/testcases/kernel/include/sparc.in
@@ -331,3 +331,4 @@ recvmmsg 328
fanotify_init 329
fanotify_mark 330
prlimit64 331
+renameat2 345
diff --git a/testcases/kernel/include/sparc64.in b/testcases/kernel/include/sparc64.in
index 83c1792..a70540a 100644
--- a/testcases/kernel/include/sparc64.in
+++ b/testcases/kernel/include/sparc64.in
@@ -307,3 +307,4 @@ recvmmsg 328
fanotify_init 329
fanotify_mark 330
prlimit64 331
+renameat2 345
diff --git a/testcases/kernel/include/x86_64.in b/testcases/kernel/include/x86_64.in
index 860e726..726b76f 100644
--- a/testcases/kernel/include/x86_64.in
+++ b/testcases/kernel/include/x86_64.in
@@ -300,4 +300,5 @@ recvmmsg 299
fanotify_init 300
fanotify_mark 301
prlimit64 302
+renameat2 316
getrandom 318
diff --git a/testcases/kernel/syscalls/.gitignore b/testcases/kernel/syscalls/.gitignore
index f3a18ab..2553b2c 100644
--- a/testcases/kernel/syscalls/.gitignore
+++ b/testcases/kernel/syscalls/.gitignore
@@ -713,6 +713,8 @@
/rename/rename13
/rename/rename14
/renameat/renameat01
+/renameat2/renameat201
+/renameat2/renameat202
/rmdir/rmdir01
/rmdir/rmdir02
/rmdir/rmdir03
diff --git a/testcases/kernel/syscalls/renameat2/Makefile b/testcases/kernel/syscalls/renameat2/Makefile
new file mode 100644
index 0000000..083a071
--- /dev/null
+++ b/testcases/kernel/syscalls/renameat2/Makefile
@@ -0,0 +1,24 @@
+#
+# Copyright (C) 2015 Cedric Hnyda chnyda@suse.com
+#
+# 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 St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+
+
+top_srcdir ?= ../../../..
+
+include $(top_srcdir)/include/mk/testcases.mk
+
+include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/renameat2/renameat2.h b/testcases/kernel/syscalls/renameat2/renameat2.h
new file mode 100644
index 0000000..8c69746
--- /dev/null
+++ b/testcases/kernel/syscalls/renameat2/renameat2.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2015 Cedric Hnyda chnyda@suse.com
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it would be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * Further, this software is distributed without any warranty that it is
+ * free of the rightful claim of any third person regarding infringement
+ * or the like. Any license provided herein, whether implied or
+ * otherwise, applies only to this software file. Patent licenses, if
+ * any, provided herein do not apply to combinations of this program with
+ * other software, or any other product whatsoever.
+ *
+ */
+
+#ifndef RENAMEAT2_H
+#define RENAMEAT2_H
+
+#include <sys/types.h>
+#include "config.h"
+#include "linux_syscall_numbers.h"
+
+#if !defined(HAVE_RENAMEAT2)
+int renameat2(int olddirfd, const char *oldpath, int newdirfd,
+ const char *newpath, unsigned int flags)
+{
+ return ltp_syscall(__NR_renameat2, olddirfd, oldpath, newdirfd,
+ newpath, flags);
+}
+#endif
+
+#endif /* RENAMEAT2_H */
diff --git a/testcases/kernel/syscalls/renameat2/renameat201.c b/testcases/kernel/syscalls/renameat2/renameat201.c
new file mode 100644
index 0000000..18db090
--- /dev/null
+++ b/testcases/kernel/syscalls/renameat2/renameat201.c
@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) 2015 Cedric Hnyda <chnyda@suse.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it would be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * Further, this software is distributed without any warranty that it is
+ * free of the rightful claim of any third person regarding infringement
+ * or the like. Any license provided herein, whether implied or
+ * otherwise, applies only to this software file. Patent licenses, if
+ * any, provided herein do not apply to combinations of this program with
+ * other software, or any other product whatsoever.
+ */
+
+ /* Description:
+ * Verify that:
+ * 1) renameat2(2) returns -1 and sets errno to EEXIST because newpath
+ * already exists and the flag RENAME_NOREPLACE is used.
+ * 2) renameat2(2) returns 0.
+ * 3) renameat2(2) returns -1 and sets errno to ENOENT because the flag
+ * RENAME_EXCHANGE is used and newpath does not exist.
+ * 4) renameat2(2) returns 0 because the flag RENAME_NOREPLACE is used,
+ * both olddirfd and newdirfd are valid and oldpath exists and
+ * newpath does not exist.
+ * 5) renameat2(2) returns -1 and sets errno to EINVAL because
+ * RENAME_NOREPLACE and RENAME_EXCHANGE are used together
+ * 6) renameat2(2) returns -1 and sets errno to EINVAL because
+ * RENAME_WHITEOUT and RENAME_EXCHANGE are used together
+ */
+
+#define _GNU_SOURCE
+
+#include "test.h"
+#include "safe_macros.h"
+#include "lapi/fcntl.h"
+#include "renameat2.h"
+
+#define TEST_DIR "test_dir/"
+#define TEST_DIR2 "test_dir2/"
+
+#define TEST_FILE "test_file"
+#define TEST_FILE2 "test_file2"
+#define TEST_FILE3 "test_file3"
+#define NON_EXIST "non_exist"
+
+char *TCID = "renameat201";
+
+static int olddirfd;
+static int newdirfd;
+
+
+static struct test_case {
+ int *olddirfd;
+ const char *oldpath;
+ int *newdirfd;
+ const char *newpath;
+ int flags;
+ int exp_errno;
+} test_cases[] = {
+ {&olddirfd, TEST_FILE, &newdirfd, TEST_FILE2, RENAME_NOREPLACE, EEXIST},
+ {&olddirfd, TEST_FILE, &newdirfd, TEST_FILE2, RENAME_EXCHANGE, 0},
+ {&olddirfd, TEST_FILE, &newdirfd, NON_EXIST, RENAME_EXCHANGE, ENOENT},
+ {&olddirfd, TEST_FILE, &newdirfd, TEST_FILE3, RENAME_NOREPLACE, 0},
+ {&olddirfd, TEST_FILE, &newdirfd, TEST_FILE2, RENAME_NOREPLACE
+ | RENAME_EXCHANGE, EINVAL},
+ {&olddirfd, TEST_FILE, &newdirfd, TEST_FILE2, RENAME_WHITEOUT
+ | RENAME_EXCHANGE, EINVAL}
+};
+
+int TST_TOTAL = ARRAY_SIZE(test_cases);
+
+static void setup(void);
+static void cleanup(void);
+static void renameat2_verify(const struct test_case *test);
+
+
+int main(int ac, char **av)
+{
+ int i;
+ int lc;
+
+ tst_parse_opts(ac, av, NULL, NULL);
+
+ setup();
+
+ for (lc = 0; lc < TEST_LOOPING(lc); lc++) {
+ tst_count = 0;
+
+ for (i = 0; i < TST_TOTAL; i++)
+ renameat2_verify(&test_cases[i]);
+ }
+
+ cleanup();
+ tst_exit();
+}
+
+static void setup(void)
+{
+ if ((tst_kvercmp(3, 15, 0)) < 0) {
+ tst_brkm(TCONF, NULL,
+ "This test can only run on kernels that are 3.15. and higher");
+ }
+
+ tst_tmpdir();
+
+ SAFE_MKDIR(cleanup, TEST_DIR, 0700);
+ SAFE_MKDIR(cleanup, TEST_DIR2, 0700);
+
+ SAFE_TOUCH(cleanup, TEST_DIR TEST_FILE, 0600, NULL);
+ SAFE_TOUCH(cleanup, TEST_DIR2 TEST_FILE2, 0600, NULL);
+ SAFE_TOUCH(cleanup, TEST_DIR TEST_FILE3, 0600, NULL);
+
+ olddirfd = SAFE_OPEN(cleanup, TEST_DIR, O_DIRECTORY);
+ newdirfd = SAFE_OPEN(cleanup, TEST_DIR2, O_DIRECTORY);
+}
+
+static void cleanup(void)
+{
+ if (olddirfd > 0 && close(olddirfd) < 0)
+ tst_resm(TWARN | TERRNO, "close olddirfd failed");
+
+ if (newdirfd > 0 && close(newdirfd) < 0)
+ tst_resm(TWARN | TERRNO, "close newdirfd failed");
+
+ tst_rmdir();
+
+}
+
+static void renameat2_verify(const struct test_case *test)
+{
+ TEST(renameat2(*(test->olddirfd), test->oldpath,
+ *(test->newdirfd), test->newpath, test->flags));
+
+ if (test->exp_errno && TEST_RETURN != -1) {
+ tst_resm(TFAIL, "renameat2() succeeded unexpectedly");
+ return;
+ }
+
+ if (test->exp_errno == 0 && TEST_RETURN != 0) {
+ tst_resm(TFAIL | TTERRNO, "renameat2() failed unexpectedly");
+ return;
+ }
+
+ if (test->exp_errno == TEST_ERRNO) {
+ tst_resm(TPASS | TTERRNO,
+ "renameat2() returned the expected value");
+ return;
+ }
+
+ tst_resm(TFAIL | TTERRNO,
+ "renameat2() got unexpected return value: expected: %d - %s",
+ test->exp_errno, tst_strerrno(test->exp_errno));
+
+}
diff --git a/testcases/kernel/syscalls/renameat2/renameat202.c b/testcases/kernel/syscalls/renameat2/renameat202.c
new file mode 100644
index 0000000..46430d8
--- /dev/null
+++ b/testcases/kernel/syscalls/renameat2/renameat202.c
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2015 Cedric Hnyda <chnyda@suse.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it would be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * Further, this software is distributed without any warranty that it is
+ * free of the rightful claim of any third person regarding infringement
+ * or the like. Any license provided herein, whether implied or
+ * otherwise, applies only to this software file. Patent licenses, if
+ * any, provided herein do not apply to combinations of this program with
+ * other software, or any other product whatsoever.
+ */
+
+ /* Description:
+ * Calls renameat2(2) with the flag RENAME_EXCHANGE and check that
+ * the content was swapped
+ */
+
+#define _GNU_SOURCE
+
+#include "test.h"
+#include "safe_macros.h"
+#include "lapi/fcntl.h"
+#include "renameat2.h"
+
+#define TEST_DIR "test_dir/"
+#define TEST_DIR2 "test_dir2/"
+
+#define TEST_FILE "test_file"
+#define TEST_FILE2 "test_file2"
+
+char *TCID = "renameat202";
+
+static int olddirfd;
+static int newdirfd;
+static int fd = -1;
+static int cnt;
+
+static const char content[] = "content";
+
+
+int TST_TOTAL = 1;
+
+static void setup(void);
+static void cleanup(void);
+static void renameat2_verify(void);
+
+
+int main(int ac, char **av)
+{
+ int lc;
+
+ tst_parse_opts(ac, av, NULL, NULL);
+
+ setup();
+
+ for (lc = 0; TEST_LOOPING(lc); lc++) {
+
+ tst_count = 0;
+
+ TEST(renameat2(olddirfd, TEST_FILE,
+ newdirfd, TEST_FILE2, RENAME_EXCHANGE));
+
+ cnt++;
+
+ renameat2_verify();
+ }
+
+ cleanup();
+ tst_exit();
+}
+
+static void setup(void)
+{
+ if ((tst_kvercmp(3, 15, 0)) < 0) {
+ tst_brkm(TCONF, NULL,
+ "This test can only run on kernels that are 3.15. and higher");
+ }
+
+ cnt = 0;
+
+ tst_tmpdir();
+
+ SAFE_MKDIR(cleanup, TEST_DIR, 0700);
+ SAFE_MKDIR(cleanup, TEST_DIR2, 0700);
+
+ SAFE_TOUCH(cleanup, TEST_DIR TEST_FILE, 0600, NULL);
+ SAFE_TOUCH(cleanup, TEST_DIR2 TEST_FILE2, 0600, NULL);
+
+ olddirfd = SAFE_OPEN(cleanup, TEST_DIR, O_DIRECTORY);
+ newdirfd = SAFE_OPEN(cleanup, TEST_DIR2, O_DIRECTORY);
+
+ SAFE_FILE_PRINTF(cleanup, TEST_DIR TEST_FILE, "%s", content);
+
+}
+
+static void cleanup(void)
+{
+ if (olddirfd > 0 && close(olddirfd) < 0)
+ tst_resm(TWARN | TERRNO, "close olddirfd failed");
+
+ if (newdirfd > 0 && close(newdirfd) < 0)
+ tst_resm(TWARN | TERRNO, "close newdirfd failed");
+
+ if (fd > 0 && close(fd) < 0)
+ tst_resm(TWARN | TERRNO, "close fd failed");
+
+ tst_rmdir();
+
+}
+
+static void renameat2_verify(void)
+{
+ char str[sizeof(content)];
+ struct stat st;
+ char *emptyfile;
+ char *contentfile;
+
+ if (TEST_RETURN != 0) {
+ tst_resm(TFAIL, "renameat2() failed unexpectedly");
+ return;
+ }
+
+ if (cnt % 2 == 1) {
+ emptyfile = TEST_DIR TEST_FILE;
+ contentfile = TEST_DIR2 TEST_FILE2;
+ } else {
+ emptyfile = TEST_DIR2 TEST_FILE2;
+ contentfile = TEST_DIR TEST_FILE;
+ }
+
+ fd = SAFE_OPEN(cleanup, contentfile, O_RDONLY);
+
+ if (stat(emptyfile, &st) < 0)
+ tst_brkm(TERRNO | TFAIL, cleanup, "stat failed");
+
+ SAFE_READ(cleanup, 0, fd, str, strlen(content) + 10);
+
+ if (fd > 0 && close(fd) < 0)
+ tst_brkm(TERRNO | TFAIL, cleanup, "close fd failed");
+ fd = 0;
+
+ if (str[strlen(content)] == '\0' && !strcmp(content, str)
+ && !st.st_size)
+ tst_resm(TPASS,
+ "renameat2() swapped the content of the two files");
+ else
+ tst_resm(TFAIL,
+ "renameat2() didn't swap the content of the two files");
+}
--
2.1.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [LTP] [PATCH V3] syscall/renameat2: Add tests for renameat2
2015-10-01 9:46 [LTP] [PATCH V3] syscall/renameat2: Add tests for renameat2 Cedric Hnyda
@ 2015-10-05 15:34 ` Cyril Hrubis
0 siblings, 0 replies; 2+ messages in thread
From: Cyril Hrubis @ 2015-10-05 15:34 UTC (permalink / raw)
To: ltp
Hi!
Pushed with small adjustements, thanks.
* Fixed the Signed-off-by line (to contain your full name)
* Fixed merge for kernel/include/sparc* that were modified meanwhile
* Changed the runtest/syscall record for renameat202 to do 10 iterations
by default (so that we stress the kernel a bit by)
* A few fixed in renameat202.c, see below.
> diff --git a/testcases/kernel/syscalls/renameat2/renameat202.c b/testcases/kernel/syscalls/renameat2/renameat202.c
> new file mode 100644
> index 0000000..46430d8
> --- /dev/null
> +++ b/testcases/kernel/syscalls/renameat2/renameat202.c
> @@ -0,0 +1,156 @@
> +/*
> + * Copyright (c) 2015 Cedric Hnyda <chnyda@suse.com>
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms of version 2 of the GNU General Public License as
> + * published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it would be useful, but
> + * WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
> + *
> + * Further, this software is distributed without any warranty that it is
> + * free of the rightful claim of any third person regarding infringement
> + * or the like. Any license provided herein, whether implied or
> + * otherwise, applies only to this software file. Patent licenses, if
> + * any, provided herein do not apply to combinations of this program with
> + * other software, or any other product whatsoever.
> + */
> +
> + /* Description:
> + * Calls renameat2(2) with the flag RENAME_EXCHANGE and check that
> + * the content was swapped
> + */
> +
> +#define _GNU_SOURCE
> +
> +#include "test.h"
> +#include "safe_macros.h"
> +#include "lapi/fcntl.h"
> +#include "renameat2.h"
> +
> +#define TEST_DIR "test_dir/"
> +#define TEST_DIR2 "test_dir2/"
> +
> +#define TEST_FILE "test_file"
> +#define TEST_FILE2 "test_file2"
> +
> +char *TCID = "renameat202";
> +
> +static int olddirfd;
> +static int newdirfd;
> +static int fd = -1;
> +static int cnt;
> +
> +static const char content[] = "content";
> +
> +
> +int TST_TOTAL = 1;
> +
> +static void setup(void);
> +static void cleanup(void);
> +static void renameat2_verify(void);
> +
> +
> +int main(int ac, char **av)
> +{
> + int lc;
> +
> + tst_parse_opts(ac, av, NULL, NULL);
> +
> + setup();
> +
> + for (lc = 0; TEST_LOOPING(lc); lc++) {
> +
> + tst_count = 0;
> +
> + TEST(renameat2(olddirfd, TEST_FILE,
> + newdirfd, TEST_FILE2, RENAME_EXCHANGE));
> +
> + cnt++;
> +
> + renameat2_verify();
> + }
> +
> + cleanup();
> + tst_exit();
> +}
> +
> +static void setup(void)
> +{
> + if ((tst_kvercmp(3, 15, 0)) < 0) {
> + tst_brkm(TCONF, NULL,
> + "This test can only run on kernels that are 3.15. and higher");
> + }
> +
> + cnt = 0;
The cnt is global variable and therefore initialized to 0 automatically.
> + tst_tmpdir();
> +
> + SAFE_MKDIR(cleanup, TEST_DIR, 0700);
> + SAFE_MKDIR(cleanup, TEST_DIR2, 0700);
> +
> + SAFE_TOUCH(cleanup, TEST_DIR TEST_FILE, 0600, NULL);
> + SAFE_TOUCH(cleanup, TEST_DIR2 TEST_FILE2, 0600, NULL);
> +
> + olddirfd = SAFE_OPEN(cleanup, TEST_DIR, O_DIRECTORY);
> + newdirfd = SAFE_OPEN(cleanup, TEST_DIR2, O_DIRECTORY);
> +
> + SAFE_FILE_PRINTF(cleanup, TEST_DIR TEST_FILE, "%s", content);
> +
> +}
> +
> +static void cleanup(void)
> +{
> + if (olddirfd > 0 && close(olddirfd) < 0)
> + tst_resm(TWARN | TERRNO, "close olddirfd failed");
> +
> + if (newdirfd > 0 && close(newdirfd) < 0)
> + tst_resm(TWARN | TERRNO, "close newdirfd failed");
> +
> + if (fd > 0 && close(fd) < 0)
> + tst_resm(TWARN | TERRNO, "close fd failed");
> +
> + tst_rmdir();
> +
> +}
> +
> +static void renameat2_verify(void)
> +{
> + char str[sizeof(content)];
> + struct stat st;
> + char *emptyfile;
> + char *contentfile;
> +
> + if (TEST_RETURN != 0) {
> + tst_resm(TFAIL, "renameat2() failed unexpectedly");
> + return;
> + }
> +
> + if (cnt % 2 == 1) {
> + emptyfile = TEST_DIR TEST_FILE;
> + contentfile = TEST_DIR2 TEST_FILE2;
> + } else {
> + emptyfile = TEST_DIR2 TEST_FILE2;
> + contentfile = TEST_DIR TEST_FILE;
> + }
> +
> + fd = SAFE_OPEN(cleanup, contentfile, O_RDONLY);
> +
> + if (stat(emptyfile, &st) < 0)
> + tst_brkm(TERRNO | TFAIL, cleanup, "stat failed");
Changed this to use SAFE_STAT() instead.
> + SAFE_READ(cleanup, 0, fd, str, strlen(content) + 10);
> +
> + if (fd > 0 && close(fd) < 0)
> + tst_brkm(TERRNO | TFAIL, cleanup, "close fd failed");
> + fd = 0;
Dropped the fd > 0 from the if, since if SAFE_READ returns, the fd points
to opened file and therefore is > 0.
> + if (str[strlen(content)] == '\0' && !strcmp(content, str)
> + && !st.st_size)
> + tst_resm(TPASS,
> + "renameat2() swapped the content of the two files");
> + else
> + tst_resm(TFAIL,
> + "renameat2() didn't swap the content of the two files");
> +}
--
Cyril Hrubis
chrubis@suse.cz
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-10-05 15:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-01 9:46 [LTP] [PATCH V3] syscall/renameat2: Add tests for renameat2 Cedric Hnyda
2015-10-05 15:34 ` Cyril Hrubis
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox