Message ID | 1692945619-1066-1-git-send-email-xuyang2018.jy@fujitsu.com |
---|---|
State | Superseded |
Headers | show |
Series | [v3] syscalls/readlinkat01: Convert to new API | expand |
Hi! On 8/25/23 08:40, Yang Xu wrote: > Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com> > --- > .../kernel/syscalls/readlinkat/readlinkat01.c | 174 +++++++----------- > 1 file changed, 62 insertions(+), 112 deletions(-) > > diff --git a/testcases/kernel/syscalls/readlinkat/readlinkat01.c b/testcases/kernel/syscalls/readlinkat/readlinkat01.c > index 985890ebe..100881615 100644 > --- a/testcases/kernel/syscalls/readlinkat/readlinkat01.c > +++ b/testcases/kernel/syscalls/readlinkat/readlinkat01.c > @@ -1,143 +1,93 @@ > -/****************************************************************************** > - * > +// SPDX-License-Identifier: GPL-2.0-or-later > +/* > * Copyright (c) International Business Machines Corp., 2006 > - * Author: Yi Yang <yyangcdl@cn.ibm.com> > * Copyright (c) Cyril Hrubis 2014 <chrubis@suse.cz> > - * > - * 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 > - * > - * This test case will verify basic function of readlinkat > - * added by kernel 2.6.16 or up. > - * > - *****************************************************************************/ > + * Copyright (c) Linux Test Project, 2003-2023 > + * Author: Yi Yang <yyangcdl@cn.ibm.com> > + */ > > -#define _GNU_SOURCE > +/*\ > + * [Description] > + * > + * Check the basic functionality of the readlinkat() system call. It would be nice to extend a the description, explaining what test cases we are going to have (symlink, dir, abspath, etc). > + */ > > -#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/readlinkat.h" > - > -static void setup(void); > -static void cleanup(void); > +#include <stdio.h> > +#include "tst_test.h" > +#include "lapi/fcntl.h" > > -char *TCID = "readlinkat01"; > +#define TEST_FILE "readlink_file" > +#define TEST_SYMLINK "readlink_symlink" > > -static int dir_fd, fd; > -static int fd_invalid = 100; > +static int file_fd, dir_fd, dir_fd2; > static int fd_atcwd = AT_FDCWD; > - > -#define TEST_SYMLINK "readlink_symlink" > -#define TEST_FILE "readlink_file" > - > -static char abspath[1024]; > - > -static struct test_case { > - int *dir_fd; > - const char *path; > - const char *exp_buf; > - int exp_ret; > - int exp_errno; > -} test_cases[] = { > - {&dir_fd, TEST_SYMLINK, TEST_FILE, sizeof(TEST_FILE)-1, 0}, > - {&dir_fd, abspath, TEST_FILE, sizeof(TEST_FILE)-1, 0}, > - {&fd, TEST_SYMLINK, NULL, -1, ENOTDIR}, > - {&fd_invalid, TEST_SYMLINK, NULL, -1, EBADF}, > - {&fd_atcwd, TEST_SYMLINK, TEST_FILE, sizeof(TEST_FILE)-1, 0}, > +static const char *abspath; > +static const char *testsymlink; > +static const char *emptypath = ""; > + > +static struct tcase { > + int *fd; > + const char **path; > +} tcases[] = { > + {&dir_fd, &testsymlink}, > + {&dir_fd, &abspath}, > + {&file_fd, &abspath}, > + {&fd_atcwd, &testsymlink}, > + {&fd_atcwd, &abspath}, > + {&dir_fd2, &emptypath}, > }; > > -int TST_TOTAL = ARRAY_SIZE(test_cases); > - > -static void verify_readlinkat(struct test_case *test) > +static void verify_readlinkat(unsigned int i) > { > char buf[1024]; > + struct tcase *tc = &tcases[i]; > > memset(buf, 0, sizeof(buf)); > > - TEST(readlinkat(*test->dir_fd, test->path, buf, sizeof(buf))); > - > - if (TEST_RETURN != test->exp_ret) { > - tst_resm(TFAIL | TTERRNO, > - "readlinkat() returned %ld, expected %d", > - TEST_RETURN, test->exp_ret); > - return; > - } > - > - if (TEST_ERRNO != test->exp_errno) { > - tst_resm(TFAIL | TTERRNO, > - "readlinkat() returned %ld, expected %d", > - TEST_RETURN, test->exp_ret); > - return; > - } > - > - if (test->exp_ret > 0 && strcmp(test->exp_buf, buf)) { > - tst_resm(TFAIL, "Unexpected buffer have '%s', expected '%s'", > - buf, test->exp_buf); > - return; > - } > - > - tst_resm(TPASS | TTERRNO, "readlinkat() returned %ld", TEST_RETURN); > -} > - > -int main(int ac, char **av) > -{ > - int lc; > - int i; > - > - tst_parse_opts(ac, av, NULL, NULL); > - > - setup(); > + TST_EXP_POSITIVE(readlinkat(*tc->fd, *tc->path, buf, sizeof(buf)), > + "readlinkat(%d, %s, %s, %ld)", > + *tc->fd, *tc->path, buf, sizeof(buf)); > > - for (lc = 0; TEST_LOOPING(lc); lc++) { > - for (i = 0; i < TST_TOTAL; i++) > - verify_readlinkat(&test_cases[i]); > - } > - > - cleanup(); > - tst_exit(); > + if (strcmp(buf, TEST_FILE) == 0) > + tst_res(TPASS, "The filename in buffer is correct"); > + else > + tst_res(TFAIL, "Wrong filename in buffer '%s'", buf); > } > > static void setup(void) > { > - tst_tmpdir(); > char *tmpdir = tst_get_tmpdir(); > > - snprintf(abspath, sizeof(abspath), "%s/" TEST_SYMLINK, tmpdir); > + abspath = tst_aprintf("%s/" TEST_SYMLINK, tmpdir); > free(tmpdir); > > - fd = SAFE_OPEN(cleanup, TEST_FILE, O_CREAT, 0600); > - SAFE_SYMLINK(cleanup, TEST_FILE, TEST_SYMLINK); > - dir_fd = SAFE_OPEN(cleanup, ".", O_DIRECTORY); > - > - TEST_PAUSE; > + file_fd = SAFE_OPEN(TEST_FILE, O_CREAT, 0600); > + SAFE_SYMLINK(TEST_FILE, TEST_SYMLINK); > + dir_fd = SAFE_OPEN(".", O_DIRECTORY); > + dir_fd2 = SAFE_OPEN(TEST_SYMLINK, O_PATH | O_NOFOLLOW); > } > > static void cleanup(void) > { > - if (fd > 0 && close(fd)) > - tst_resm(TWARN | TERRNO, "Failed to close fd"); > + if (file_fd > -1) > + SAFE_CLOSE(file_fd); > > - if (dir_fd > 0 && close(dir_fd)) > - tst_resm(TWARN | TERRNO, "Failed to close dir_fd"); > + if (dir_fd > -1) > + SAFE_CLOSE(dir_fd); > > - tst_rmdir(); > + if (dir_fd2 > -1) > + SAFE_CLOSE(dir_fd2); > } > + > +static struct tst_test test = { > + .test = verify_readlinkat, > + .needs_tmpdir = 1, > + .setup = setup, > + .cleanup = cleanup, > + .bufs = (struct tst_buffers []) { > + {&testsymlink, .str = TEST_SYMLINK}, > + {}, > + }, > + .tcnt = ARRAY_SIZE(tcases), > +}; Overall it looks good to me. Thank you, Andrea Cervesato
Hi Andrea.
Hi!
On 8/25/23 08:40, Yang Xu wrote:
Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com><mailto:xuyang2018.jy@fujitsu.com>
---
.../kernel/syscalls/readlinkat/readlinkat01.c | 174 +++++++-----------
1 file changed, 62 insertions(+), 112 deletions(-)
diff --git a/testcases/kernel/syscalls/readlinkat/readlinkat01.c b/testcases/kernel/syscalls/readlinkat/readlinkat01.c
index 985890ebe..100881615 100644
--- a/testcases/kernel/syscalls/readlinkat/readlinkat01.c
+++ b/testcases/kernel/syscalls/readlinkat/readlinkat01.c
@@ -1,143 +1,93 @@
-/******************************************************************************
- *
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
* Copyright (c) International Business Machines Corp., 2006
- * Author: Yi Yang <yyangcdl@cn.ibm.com><mailto:yyangcdl@cn.ibm.com>
* Copyright (c) Cyril Hrubis 2014 <chrubis@suse.cz><mailto:chrubis@suse.cz>
- *
- * 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
- *
- * This test case will verify basic function of readlinkat
- * added by kernel 2.6.16 or up.
- *
- *****************************************************************************/
+ * Copyright (c) Linux Test Project, 2003-2023
+ * Author: Yi Yang <yyangcdl@cn.ibm.com><mailto:yyangcdl@cn.ibm.com>
+ */
-#define _GNU_SOURCE
+/*\
+ * [Description]
+ *
+ * Check the basic functionality of the readlinkat() system call.
It would be nice to extend a the description, explaining what test cases we are going to have (symlink, dir, abspath, etc).
ok.I'll update it.
+ */
-#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/readlinkat.h"
-
-static void setup(void);
-static void cleanup(void);
+#include <stdio.h>
+#include "tst_test.h"
+#include "lapi/fcntl.h"
-char *TCID = "readlinkat01";
+#define TEST_FILE "readlink_file"
+#define TEST_SYMLINK "readlink_symlink"
-static int dir_fd, fd;
-static int fd_invalid = 100;
+static int file_fd, dir_fd, dir_fd2;
static int fd_atcwd = AT_FDCWD;
-
-#define TEST_SYMLINK "readlink_symlink"
-#define TEST_FILE "readlink_file"
-
-static char abspath[1024];
-
-static struct test_case {
- int *dir_fd;
- const char *path;
- const char *exp_buf;
- int exp_ret;
- int exp_errno;
-} test_cases[] = {
- {&dir_fd, TEST_SYMLINK, TEST_FILE, sizeof(TEST_FILE)-1, 0},
- {&dir_fd, abspath, TEST_FILE, sizeof(TEST_FILE)-1, 0},
- {&fd, TEST_SYMLINK, NULL, -1, ENOTDIR},
- {&fd_invalid, TEST_SYMLINK, NULL, -1, EBADF},
- {&fd_atcwd, TEST_SYMLINK, TEST_FILE, sizeof(TEST_FILE)-1, 0},
+static const char *abspath;
+static const char *testsymlink;
+static const char *emptypath = "";
+
+static struct tcase {
+ int *fd;
+ const char **path;
+} tcases[] = {
+ {&dir_fd, &testsymlink},
+ {&dir_fd, &abspath},
+ {&file_fd, &abspath},
+ {&fd_atcwd, &testsymlink},
+ {&fd_atcwd, &abspath},
+ {&dir_fd2, &emptypath},
};
-int TST_TOTAL = ARRAY_SIZE(test_cases);
-
-static void verify_readlinkat(struct test_case *test)
+static void verify_readlinkat(unsigned int i)
{
char buf[1024];
+ struct tcase *tc = &tcases[i];
memset(buf, 0, sizeof(buf));
- TEST(readlinkat(*test->dir_fd, test->path, buf, sizeof(buf)));
-
- if (TEST_RETURN != test->exp_ret) {
- tst_resm(TFAIL | TTERRNO,
- "readlinkat() returned %ld, expected %d",
- TEST_RETURN, test->exp_ret);
- return;
- }
-
- if (TEST_ERRNO != test->exp_errno) {
- tst_resm(TFAIL | TTERRNO,
- "readlinkat() returned %ld, expected %d",
- TEST_RETURN, test->exp_ret);
- return;
- }
-
- if (test->exp_ret > 0 && strcmp(test->exp_buf, buf)) {
- tst_resm(TFAIL, "Unexpected buffer have '%s', expected '%s'",
- buf, test->exp_buf);
- return;
- }
-
- tst_resm(TPASS | TTERRNO, "readlinkat() returned %ld", TEST_RETURN);
-}
-
-int main(int ac, char **av)
-{
- int lc;
- int i;
-
- tst_parse_opts(ac, av, NULL, NULL);
-
- setup();
+ TST_EXP_POSITIVE(readlinkat(*tc->fd, *tc->path, buf, sizeof(buf)),
+ "readlinkat(%d, %s, %s, %ld)",
+ *tc->fd, *tc->path, buf, sizeof(buf));
- for (lc = 0; TEST_LOOPING(lc); lc++) {
- for (i = 0; i < TST_TOTAL; i++)
- verify_readlinkat(&test_cases[i]);
- }
-
- cleanup();
- tst_exit();
+ if (strcmp(buf, TEST_FILE) == 0)
+ tst_res(TPASS, "The filename in buffer is correct");
+ else
+ tst_res(TFAIL, "Wrong filename in buffer '%s'", buf);
}
static void setup(void)
{
- tst_tmpdir();
char *tmpdir = tst_get_tmpdir();
- snprintf(abspath, sizeof(abspath), "%s/" TEST_SYMLINK, tmpdir);
+ abspath = tst_aprintf("%s/" TEST_SYMLINK, tmpdir);
free(tmpdir);
- fd = SAFE_OPEN(cleanup, TEST_FILE, O_CREAT, 0600);
- SAFE_SYMLINK(cleanup, TEST_FILE, TEST_SYMLINK);
- dir_fd = SAFE_OPEN(cleanup, ".", O_DIRECTORY);
-
- TEST_PAUSE;
+ file_fd = SAFE_OPEN(TEST_FILE, O_CREAT, 0600);
+ SAFE_SYMLINK(TEST_FILE, TEST_SYMLINK);
+ dir_fd = SAFE_OPEN(".", O_DIRECTORY);
+ dir_fd2 = SAFE_OPEN(TEST_SYMLINK, O_PATH | O_NOFOLLOW);
}
static void cleanup(void)
{
- if (fd > 0 && close(fd))
- tst_resm(TWARN | TERRNO, "Failed to close fd");
+ if (file_fd > -1)
+ SAFE_CLOSE(file_fd);
- if (dir_fd > 0 && close(dir_fd))
- tst_resm(TWARN | TERRNO, "Failed to close dir_fd");
+ if (dir_fd > -1)
+ SAFE_CLOSE(dir_fd);
- tst_rmdir();
+ if (dir_fd2 > -1)
+ SAFE_CLOSE(dir_fd2);
}
+
+static struct tst_test test = {
+ .test = verify_readlinkat,
+ .needs_tmpdir = 1,
+ .setup = setup,
+ .cleanup = cleanup,
+ .bufs = (struct tst_buffers []) {
+ {&testsymlink, .str = TEST_SYMLINK},
+ {},
+ },
+ .tcnt = ARRAY_SIZE(tcases),
+};
Overall it looks good to me.
Thank you,
Andrea Cervesato
Thanks for the patient review.
Best Regards
Yang Xu
diff --git a/testcases/kernel/syscalls/readlinkat/readlinkat01.c b/testcases/kernel/syscalls/readlinkat/readlinkat01.c index 985890ebe..100881615 100644 --- a/testcases/kernel/syscalls/readlinkat/readlinkat01.c +++ b/testcases/kernel/syscalls/readlinkat/readlinkat01.c @@ -1,143 +1,93 @@ -/****************************************************************************** - * +// SPDX-License-Identifier: GPL-2.0-or-later +/* * Copyright (c) International Business Machines Corp., 2006 - * Author: Yi Yang <yyangcdl@cn.ibm.com> * Copyright (c) Cyril Hrubis 2014 <chrubis@suse.cz> - * - * 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 - * - * This test case will verify basic function of readlinkat - * added by kernel 2.6.16 or up. - * - *****************************************************************************/ + * Copyright (c) Linux Test Project, 2003-2023 + * Author: Yi Yang <yyangcdl@cn.ibm.com> + */ -#define _GNU_SOURCE +/*\ + * [Description] + * + * Check the basic functionality of the readlinkat() system call. + */ -#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/readlinkat.h" - -static void setup(void); -static void cleanup(void); +#include <stdio.h> +#include "tst_test.h" +#include "lapi/fcntl.h" -char *TCID = "readlinkat01"; +#define TEST_FILE "readlink_file" +#define TEST_SYMLINK "readlink_symlink" -static int dir_fd, fd; -static int fd_invalid = 100; +static int file_fd, dir_fd, dir_fd2; static int fd_atcwd = AT_FDCWD; - -#define TEST_SYMLINK "readlink_symlink" -#define TEST_FILE "readlink_file" - -static char abspath[1024]; - -static struct test_case { - int *dir_fd; - const char *path; - const char *exp_buf; - int exp_ret; - int exp_errno; -} test_cases[] = { - {&dir_fd, TEST_SYMLINK, TEST_FILE, sizeof(TEST_FILE)-1, 0}, - {&dir_fd, abspath, TEST_FILE, sizeof(TEST_FILE)-1, 0}, - {&fd, TEST_SYMLINK, NULL, -1, ENOTDIR}, - {&fd_invalid, TEST_SYMLINK, NULL, -1, EBADF}, - {&fd_atcwd, TEST_SYMLINK, TEST_FILE, sizeof(TEST_FILE)-1, 0}, +static const char *abspath; +static const char *testsymlink; +static const char *emptypath = ""; + +static struct tcase { + int *fd; + const char **path; +} tcases[] = { + {&dir_fd, &testsymlink}, + {&dir_fd, &abspath}, + {&file_fd, &abspath}, + {&fd_atcwd, &testsymlink}, + {&fd_atcwd, &abspath}, + {&dir_fd2, &emptypath}, }; -int TST_TOTAL = ARRAY_SIZE(test_cases); - -static void verify_readlinkat(struct test_case *test) +static void verify_readlinkat(unsigned int i) { char buf[1024]; + struct tcase *tc = &tcases[i]; memset(buf, 0, sizeof(buf)); - TEST(readlinkat(*test->dir_fd, test->path, buf, sizeof(buf))); - - if (TEST_RETURN != test->exp_ret) { - tst_resm(TFAIL | TTERRNO, - "readlinkat() returned %ld, expected %d", - TEST_RETURN, test->exp_ret); - return; - } - - if (TEST_ERRNO != test->exp_errno) { - tst_resm(TFAIL | TTERRNO, - "readlinkat() returned %ld, expected %d", - TEST_RETURN, test->exp_ret); - return; - } - - if (test->exp_ret > 0 && strcmp(test->exp_buf, buf)) { - tst_resm(TFAIL, "Unexpected buffer have '%s', expected '%s'", - buf, test->exp_buf); - return; - } - - tst_resm(TPASS | TTERRNO, "readlinkat() returned %ld", TEST_RETURN); -} - -int main(int ac, char **av) -{ - int lc; - int i; - - tst_parse_opts(ac, av, NULL, NULL); - - setup(); + TST_EXP_POSITIVE(readlinkat(*tc->fd, *tc->path, buf, sizeof(buf)), + "readlinkat(%d, %s, %s, %ld)", + *tc->fd, *tc->path, buf, sizeof(buf)); - for (lc = 0; TEST_LOOPING(lc); lc++) { - for (i = 0; i < TST_TOTAL; i++) - verify_readlinkat(&test_cases[i]); - } - - cleanup(); - tst_exit(); + if (strcmp(buf, TEST_FILE) == 0) + tst_res(TPASS, "The filename in buffer is correct"); + else + tst_res(TFAIL, "Wrong filename in buffer '%s'", buf); } static void setup(void) { - tst_tmpdir(); char *tmpdir = tst_get_tmpdir(); - snprintf(abspath, sizeof(abspath), "%s/" TEST_SYMLINK, tmpdir); + abspath = tst_aprintf("%s/" TEST_SYMLINK, tmpdir); free(tmpdir); - fd = SAFE_OPEN(cleanup, TEST_FILE, O_CREAT, 0600); - SAFE_SYMLINK(cleanup, TEST_FILE, TEST_SYMLINK); - dir_fd = SAFE_OPEN(cleanup, ".", O_DIRECTORY); - - TEST_PAUSE; + file_fd = SAFE_OPEN(TEST_FILE, O_CREAT, 0600); + SAFE_SYMLINK(TEST_FILE, TEST_SYMLINK); + dir_fd = SAFE_OPEN(".", O_DIRECTORY); + dir_fd2 = SAFE_OPEN(TEST_SYMLINK, O_PATH | O_NOFOLLOW); } static void cleanup(void) { - if (fd > 0 && close(fd)) - tst_resm(TWARN | TERRNO, "Failed to close fd"); + if (file_fd > -1) + SAFE_CLOSE(file_fd); - if (dir_fd > 0 && close(dir_fd)) - tst_resm(TWARN | TERRNO, "Failed to close dir_fd"); + if (dir_fd > -1) + SAFE_CLOSE(dir_fd); - tst_rmdir(); + if (dir_fd2 > -1) + SAFE_CLOSE(dir_fd2); } + +static struct tst_test test = { + .test = verify_readlinkat, + .needs_tmpdir = 1, + .setup = setup, + .cleanup = cleanup, + .bufs = (struct tst_buffers []) { + {&testsymlink, .str = TEST_SYMLINK}, + {}, + }, + .tcnt = ARRAY_SIZE(tcases), +};
Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com> --- .../kernel/syscalls/readlinkat/readlinkat01.c | 174 +++++++----------- 1 file changed, 62 insertions(+), 112 deletions(-)