Signed-off-by: Guangwen Feng <fenggw-f...@cn.fujitsu.com>
---
testcases/kernel/syscalls/readdir/readdir03.c | 150 ++++++++++++++++++++++++++
testcases/kernel/syscalls/readdir/readdir21.c | 150 --------------------------
2 files changed, 150 insertions(+), 150 deletions(-)
create mode 100644 testcases/kernel/syscalls/readdir/readdir03.c
delete mode 100644 testcases/kernel/syscalls/readdir/readdir21.c
diff --git a/testcases/kernel/syscalls/readdir/readdir03.c
b/testcases/kernel/syscalls/readdir/readdir03.c
new file mode 100644
index 0000000..ced8fa7
--- /dev/null
+++ b/testcases/kernel/syscalls/readdir/readdir03.c
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2014 Fujitsu Ltd.
+ * Author: Zeng Linggang <zenglg...@cn.fujitsu.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.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+/*
+ * Test Description:
+ * Verify that,
+ * 1. Creat a directory and open it, then delete the directory, ENOENT would
+ * return.
+ * 2. File descriptor does not refer to a directory, ENOTDIR would return.
+ * 3. Invalid file descriptor fd, EBADF would return.
+ * 4. Argument points outside the calling process's address space, EFAULT
+ * would return.
+ *
+ * PS:
+ * This file is for readdir(2) and the other files(readdir01.c and
+ * readdir02.c) are for readdir(3).
+ */
+
+#define _GNU_SOURCE
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <unistd.h>
+#include <sys/mman.h>
+#include "test.h"
+#include "safe_macros.h"
+#include "linux_syscall_numbers.h"
+#include "lapi/readdir.h"
+
+char *TCID = "readdir21";
+
+#define TEST_DIR "test_dir"
+#define TEST_DIR4 "test_dir4"
+#define TEST_FILE "test_file"
+#define DIR_MODE (S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP| \
+ S_IXGRP|S_IROTH|S_IXOTH)
+
+static unsigned int del_dir_fd, file_fd;
+static unsigned int invalid_fd = 999;
+static unsigned int dir_fd;
+static struct old_linux_dirent dirp;
+static void setup(void);
+static void cleanup(void);
+
+static struct test_case_t {
+ unsigned int *fd;
+ struct old_linux_dirent *dirp;
+ unsigned int count;
+ int exp_errno;
+} test_cases[] = {
+ {&del_dir_fd, &dirp, sizeof(struct old_linux_dirent), ENOENT},
+ {&file_fd, &dirp, sizeof(struct old_linux_dirent), ENOTDIR},
+ {&invalid_fd, &dirp, sizeof(struct old_linux_dirent), EBADF},
+#if !defined(UCLINUX)
+ {&dir_fd, (struct old_linux_dirent *)-1,
+ sizeof(struct old_linux_dirent), EFAULT},
+#endif
+};
+
+int TST_TOTAL = ARRAY_SIZE(test_cases);
+static void readdir_verify(const struct test_case_t *);
+
+int main(int argc, char **argv)
+{
+ int i, lc;
+
+ tst_parse_opts(argc, argv, NULL, NULL);
+
+ setup();
+
+ for (lc = 0; TEST_LOOPING(lc); lc++) {
+ tst_count = 0;
+ for (i = 0; i < TST_TOTAL; i++)
+ readdir_verify(&test_cases[i]);
+ }
+
+ cleanup();
+ tst_exit();
+}
+
+static void setup(void)
+{
+ tst_sig(NOFORK, DEF_HANDLER, cleanup);
+
+ TEST_PAUSE;
+
+ tst_tmpdir();
+
+ SAFE_MKDIR(cleanup, TEST_DIR, DIR_MODE);
+ del_dir_fd = SAFE_OPEN(cleanup, TEST_DIR, O_RDONLY | O_DIRECTORY);
+ SAFE_RMDIR(cleanup, TEST_DIR);
+
+ file_fd = SAFE_OPEN(cleanup, TEST_FILE, O_RDWR | O_CREAT, 0777);
+
+ SAFE_MKDIR(cleanup, TEST_DIR4, DIR_MODE);
+ dir_fd = SAFE_OPEN(cleanup, TEST_DIR4, O_RDONLY | O_DIRECTORY);
+
+#if !defined(UCLINUX)
+ test_cases[3].dirp = SAFE_MMAP(cleanup, 0, 1, PROT_NONE,
+ MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
+#endif
+}
+
+static void readdir_verify(const struct test_case_t *test)
+{
+ TEST(ltp_syscall(__NR_readdir, *test->fd, test->dirp, test->count));
+
+ if (TEST_RETURN != -1) {
+ tst_resm(TFAIL, "readdir() succeeded unexpectedly");
+ return;
+ }
+
+ if (TEST_ERRNO == test->exp_errno) {
+ tst_resm(TPASS | TTERRNO, "readdir() failed as expected");
+ } else {
+ tst_resm(TFAIL | TTERRNO,
+ "readdir() failed unexpectedly; expected: %d - %s",
+ test->exp_errno, strerror(test->exp_errno));
+ }
+}
+
+static void cleanup(void)
+{
+ if (dir_fd > 0)
+ close(dir_fd);
+
+ if (del_dir_fd > 0)
+ close(del_dir_fd);
+
+ if (file_fd > 0)
+ close(file_fd);
+
+ tst_rmdir();
+}
diff --git a/testcases/kernel/syscalls/readdir/readdir21.c
b/testcases/kernel/syscalls/readdir/readdir21.c
deleted file mode 100644
index ced8fa7..0000000
--- a/testcases/kernel/syscalls/readdir/readdir21.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (c) 2014 Fujitsu Ltd.
- * Author: Zeng Linggang <zenglg...@cn.fujitsu.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.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-/*
- * Test Description:
- * Verify that,
- * 1. Creat a directory and open it, then delete the directory, ENOENT would
- * return.
- * 2. File descriptor does not refer to a directory, ENOTDIR would return.
- * 3. Invalid file descriptor fd, EBADF would return.
- * 4. Argument points outside the calling process's address space, EFAULT
- * would return.
- *
- * PS:
- * This file is for readdir(2) and the other files(readdir01.c and
- * readdir02.c) are for readdir(3).
- */
-
-#define _GNU_SOURCE
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/mman.h>
-#include "test.h"
-#include "safe_macros.h"
-#include "linux_syscall_numbers.h"
-#include "lapi/readdir.h"
-
-char *TCID = "readdir21";
-
-#define TEST_DIR "test_dir"
-#define TEST_DIR4 "test_dir4"
-#define TEST_FILE "test_file"
-#define DIR_MODE (S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP| \
- S_IXGRP|S_IROTH|S_IXOTH)
-
-static unsigned int del_dir_fd, file_fd;
-static unsigned int invalid_fd = 999;
-static unsigned int dir_fd;
-static struct old_linux_dirent dirp;
-static void setup(void);
-static void cleanup(void);
-
-static struct test_case_t {
- unsigned int *fd;
- struct old_linux_dirent *dirp;
- unsigned int count;
- int exp_errno;
-} test_cases[] = {
- {&del_dir_fd, &dirp, sizeof(struct old_linux_dirent), ENOENT},
- {&file_fd, &dirp, sizeof(struct old_linux_dirent), ENOTDIR},
- {&invalid_fd, &dirp, sizeof(struct old_linux_dirent), EBADF},
-#if !defined(UCLINUX)
- {&dir_fd, (struct old_linux_dirent *)-1,
- sizeof(struct old_linux_dirent), EFAULT},
-#endif
-};
-
-int TST_TOTAL = ARRAY_SIZE(test_cases);
-static void readdir_verify(const struct test_case_t *);
-
-int main(int argc, char **argv)
-{
- int i, lc;
-
- tst_parse_opts(argc, argv, NULL, NULL);
-
- setup();
-
- for (lc = 0; TEST_LOOPING(lc); lc++) {
- tst_count = 0;
- for (i = 0; i < TST_TOTAL; i++)
- readdir_verify(&test_cases[i]);
- }
-
- cleanup();
- tst_exit();
-}
-
-static void setup(void)
-{
- tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
- TEST_PAUSE;
-
- tst_tmpdir();
-
- SAFE_MKDIR(cleanup, TEST_DIR, DIR_MODE);
- del_dir_fd = SAFE_OPEN(cleanup, TEST_DIR, O_RDONLY | O_DIRECTORY);
- SAFE_RMDIR(cleanup, TEST_DIR);
-
- file_fd = SAFE_OPEN(cleanup, TEST_FILE, O_RDWR | O_CREAT, 0777);
-
- SAFE_MKDIR(cleanup, TEST_DIR4, DIR_MODE);
- dir_fd = SAFE_OPEN(cleanup, TEST_DIR4, O_RDONLY | O_DIRECTORY);
-
-#if !defined(UCLINUX)
- test_cases[3].dirp = SAFE_MMAP(cleanup, 0, 1, PROT_NONE,
- MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
-#endif
-}
-
-static void readdir_verify(const struct test_case_t *test)
-{
- TEST(ltp_syscall(__NR_readdir, *test->fd, test->dirp, test->count));
-
- if (TEST_RETURN != -1) {
- tst_resm(TFAIL, "readdir() succeeded unexpectedly");
- return;
- }
-
- if (TEST_ERRNO == test->exp_errno) {
- tst_resm(TPASS | TTERRNO, "readdir() failed as expected");
- } else {
- tst_resm(TFAIL | TTERRNO,
- "readdir() failed unexpectedly; expected: %d - %s",
- test->exp_errno, strerror(test->exp_errno));
- }
-}
-
-static void cleanup(void)
-{
- if (dir_fd > 0)
- close(dir_fd);
-
- if (del_dir_fd > 0)
- close(del_dir_fd);
-
- if (file_fd > 0)
- close(file_fd);
-
- tst_rmdir();
-}
--
1.8.4.2
------------------------------------------------------------------------------
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
