[LTP] [PATCH v2] syscalls/unlinkat01: Bugfix and update to new API
Zhao Gongyi
zhaogongyi@huawei.com
Thu May 6 11:32:01 CEST 2021
1) When run the test with option "-i 2", test will fail, and fixed
2) Update to new API
Signed-off-by: Zhao Gongyi <zhaogongyi@huawei.com>
---
v1->v2:
1)remove usless "#define _GNU_SOURCE"
2)remove usless "#include <linux/limits.h>"
3)remove usless "#ifndef AT_FDCWD"
4)use static struct for testcases data
5)use unlinkat() libc implementation
6)fix compiler warnning
.../kernel/syscalls/unlinkat/unlinkat01.c | 202 +++++++-----------
1 file changed, 82 insertions(+), 120 deletions(-)
diff --git a/testcases/kernel/syscalls/unlinkat/unlinkat01.c b/testcases/kernel/syscalls/unlinkat/unlinkat01.c
index 76566e85a..7be3918b3 100644
--- a/testcases/kernel/syscalls/unlinkat/unlinkat01.c
+++ b/testcases/kernel/syscalls/unlinkat/unlinkat01.c
@@ -1,146 +1,108 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright (c) 2016 Oracle and/or its affiliates. All Rights Reserved.
* 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 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. 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, see <http://www.gnu.org/licenses/>.
- *
- * DESCRIPTION
- * This test case will verify basic function of unlinkat
- * added by kernel 2.6.16 or up.
- *
- * Author
- * Yi Yang <yyangcdl@cn.ibm.com>
+ * Author: Yi Yang <yyangcdl@cn.ibm.com>
*/
-#define _GNU_SOURCE
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "safe_macros.h"
-#include "lapi/syscalls.h"
-
-#define TEST_CASES 7
-#ifndef AT_FDCWD
-#define AT_FDCWD -100
-#endif
-#ifndef AT_REMOVEDIR
-#define AT_REMOVEDIR 0x200
-#endif
-
-void setup();
-void cleanup();
+/*\
+ * [Description]
+ * Basic unlinkat() test.
+ */
-char *TCID = "unlinkat01";
-int TST_TOTAL = TEST_CASES;
+#include "tst_test.h"
+#include "lapi/syscalls.h"
+#include "tst_safe_stdio.h"
+#include "lapi/fcntl.h"
static const char pathname[] = "unlinkattestdir",
subpathname[] = "unlinkatsubtestdir",
subpathdir[] = "unlinkattestdir/unlinkatsubtestdir",
testfile[] = "unlinkattestfile.txt",
testfile2[] = "unlinkattestdir/unlinkattestfile.txt";
-static char *testfile3;
-static int fds[TEST_CASES];
-static const char *filenames[TEST_CASES];
-static const int expected_errno[] = { 0, 0, ENOTDIR, EBADF, EINVAL, 0, 0 };
-static const int flags[] = { 0, 0, 0, 0, 9999, 0, AT_REMOVEDIR };
+static char *testfile3;
-int myunlinkat(int dirfd, const char *filename, int flags)
+static int fd;
+static int getfd(int i)
{
- return ltp_syscall(__NR_unlinkat, dirfd, filename, flags);
+ if (i == 2)
+ fd = SAFE_OPEN(testfile3, O_CREAT | O_RDWR, 0600);
+ else
+ fd = SAFE_OPEN(pathname, O_DIRECTORY);
+
+ return fd;
}
-int main(int ac, char **av)
+static struct tcase {
+ int fd;
+ char *filename;
+ int flag;
+ int exp_errno;
+} tc[] = {
+ {0, testfile, 0, 0},
+ {0, NULL, 0, 0},
+ {0, testfile, 0, ENOTDIR},
+ {100, testfile, 0, EBADF},
+ {0, testfile, 9999, EINVAL},
+ {AT_FDCWD, testfile, 0, 0},
+ {0, subpathname, AT_REMOVEDIR, 0},
+};
+
+static void run(unsigned int i)
{
- int lc;
- int i;
-
- if ((tst_kvercmp(2, 6, 16)) < 0)
- tst_brkm(TCONF, NULL, "Test must be run with kernel 2.6.16+");
-
- tst_parse_opts(ac, av, NULL, NULL);
-
- setup();
-
- for (lc = 0; TEST_LOOPING(lc); lc++) {
- tst_count = 0;
-
- for (i = 0; i < TST_TOTAL; i++) {
- TEST(myunlinkat(fds[i], filenames[i], flags[i]));
-
- if (TEST_ERRNO == expected_errno[i]) {
- tst_resm(TPASS | TTERRNO,
- "unlinkat() returned expected errno");
- } else {
- tst_resm(TFAIL | TTERRNO, "unlinkat() failed");
- }
- }
-
- }
-
- cleanup();
- tst_exit();
+ /* tesfile2 will be unlinked by test0. */
+ if (access(testfile2, F_OK))
+ SAFE_FILE_PRINTF(testfile2, testfile2);
+
+ /* testfile3 will be unlined by test1. */
+ if (access(testfile3, F_OK))
+ SAFE_OPEN(testfile3, O_CREAT | O_RDWR, 0600);
+
+ /* subpathdir will be unlinked by test6. */
+ if (access(subpathdir, F_OK))
+ SAFE_MKDIR(subpathdir, 0700);
+
+ /* testfile must exist except test1 and test6. */
+ if (access(testfile, F_OK))
+ SAFE_FILE_PRINTF(testfile, testfile);
+
+ if (tc[i].fd)
+ TEST(unlinkat(tc[i].fd, tc[i].filename, tc[i].flag));
+ else
+ TEST(unlinkat(getfd(i), tc[i].filename, tc[i].flag));
+
+ if (TST_ERR == tc[i].exp_errno)
+ tst_res(TPASS | TTERRNO, "unlinkat() returned expected errno");
+ else
+ tst_res(TFAIL | TTERRNO, "unlinkat() failed");
+
+ if (!tc[i].fd)
+ SAFE_CLOSE(fd);
}
-void setup(void)
+static void setup(void)
{
- tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
- tst_tmpdir();
-
- char *abs_path = tst_get_tmpdir();
-
- SAFE_ASPRINTF(cleanup, &testfile3, "%s/unlinkatfile3.txt", abs_path);
-
- free(abs_path);
-
- SAFE_MKDIR(cleanup, pathname, 0700);
- SAFE_MKDIR(cleanup, subpathdir, 0700);
-
- fds[0] = SAFE_OPEN(cleanup, pathname, O_DIRECTORY);
- fds[1] = fds[4] = fds[6] = fds[0];
+ char buf[PATH_MAX];
+ SAFE_GETCWD(buf, PATH_MAX);
+ SAFE_ASPRINTF(&testfile3, "%s/unlinkatfile3.txt", buf);
+ tc[1].filename = testfile3;
- SAFE_FILE_PRINTF(cleanup, testfile, testfile);
- SAFE_FILE_PRINTF(cleanup, testfile2, testfile2);
-
- fds[2] = SAFE_OPEN(cleanup, testfile3, O_CREAT | O_RDWR, 0600);
-
- fds[3] = 100;
- fds[5] = AT_FDCWD;
-
- filenames[0] = filenames[2] = filenames[3] = filenames[4] =
- filenames[5] = testfile;
- filenames[1] = testfile3;
- filenames[6] = subpathname;
-
- TEST_PAUSE;
+ SAFE_MKDIR(pathname, 0700);
}
-void cleanup(void)
+static void cleanup(void)
{
- if (fds[0] > 0)
- close(fds[0]);
- if (fds[2] > 0)
- close(fds[2]);
-
- free(testfile3);
- tst_rmdir();
+ SAFE_UNLINK(testfile);
+ SAFE_UNLINK(testfile2);
+ SAFE_RMDIR(pathname);
}
+
+static struct tst_test test = {
+ .needs_tmpdir = 1,
+ .tcnt = ARRAY_SIZE(tc),
+ .min_kver = "2.6.16",
+ .setup = setup,
+ .test = run,
+ .cleanup = cleanup,
+};
--
2.17.1
More information about the ltp
mailing list