Message ID | 20211117033951.16352-1-tangmeng@uniontech.com |
---|---|
State | Changes Requested |
Headers | show |
Series | [1/2] fchownat/fchownat01: Convert to new API | expand |
Hi! First of all the patch has whitespace issues, please make sure to run make check-fchownat01 and fix all the warnings before commiting the changes. > --- > testcases/kernel/syscalls/fchownat/fchownat.h | 15 +- > .../kernel/syscalls/fchownat/fchownat01.c | 131 +++++------------- > 2 files changed, 39 insertions(+), 107 deletions(-) > > diff --git a/testcases/kernel/syscalls/fchownat/fchownat.h b/testcases/kernel/syscalls/fchownat/fchownat.h > index a95c26f93..75c435dab 100644 > --- a/testcases/kernel/syscalls/fchownat/fchownat.h > +++ b/testcases/kernel/syscalls/fchownat/fchownat.h > @@ -1,20 +1,7 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * 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. > - * > */ This header has to be fixed as well, the new API uses tst_syscall() instead of ltp_syscall(). > #ifndef FCHOWNAT_H > diff --git a/testcases/kernel/syscalls/fchownat/fchownat01.c b/testcases/kernel/syscalls/fchownat/fchownat01.c > index 9f4ecded7..b18af54f4 100644 > --- a/testcases/kernel/syscalls/fchownat/fchownat01.c > +++ b/testcases/kernel/syscalls/fchownat/fchownat01.c > @@ -1,60 +1,36 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Copyright (c) International Business Machines Corp., 2006 > * AUTHOR: Yi Yang <yyangcdl@cn.ibm.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 Street, Fifth Floor, Boston, MA 02110-1301 USA > */ > -/* > - * DESCRIPTION > - * This test case will verify basic function of fchownat > - * added by kernel 2.6.16 or up. > + > +/*\ > + * [Description] > + * > + * This test case will verify basic function of fchownat > + * added by kernel 2.6.16 or up. > */ > > #define _GNU_SOURCE > > -#include <sys/types.h> > -#include <sys/stat.h> > -#include <fcntl.h> > -#include <unistd.h> > -#include <stdlib.h> > -#include <errno.h> > -#include <string.h> > -#include <signal.h> > - > -#include "test.h" > -#include "safe_macros.h" > +#include "tst_test.h" > #include "fchownat.h" > #include "lapi/fcntl.h" > > #define TESTFILE "testfile" > > -static void setup(void); > -static void cleanup(void); > - > static int dir_fd; > static int fd; > static int no_fd = -1; > static int cu_fd = AT_FDCWD; > > -static struct test_case_t { > +static struct tcase { > int exp_ret; > int exp_errno; > int flag; > int *fds; > char *filenames; These two should really be just fd and filename, since they are single quantities they shouldn't be plural. > -} test_cases[] = { > +} tcases[] = { > {0, 0, 0, &dir_fd, TESTFILE}, > {-1, ENOTDIR, 0, &fd, TESTFILE}, > {-1, EBADF, 0, &no_fd, TESTFILE}, > @@ -62,77 +38,46 @@ static struct test_case_t { > {0, 0, 0, &cu_fd, TESTFILE}, > }; > > -char *TCID = "fchownat01"; > -int TST_TOTAL = ARRAY_SIZE(test_cases); > -static void fchownat_verify(const struct test_case_t *); > - > -int main(int ac, char **av) > +static void verify_fchownat(unsigned int i) > { > - int lc; > - int i; > - > - tst_parse_opts(ac, av, NULL, NULL); > - > - setup(); > + struct tcase *tc = &tcases[i]; > > - for (lc = 0; TEST_LOOPING(lc); lc++) { > - tst_count = 0; > - for (i = 0; i < TST_TOTAL; i++) > - fchownat_verify(&test_cases[i]); > + if (tc->exp_ret == 0) { > + TST_EXP_PASS(fchownat(*(tc->fds), tc->filenames, geteuid(), > + getegid(), tc->flag), > + "fchownat() returned %ld, expected %d, errno=%d", > + TST_RET, tc->exp_ret, tc->exp_errno); ^ Here we should describe _what_ is being done, the pass/fail messages are generated by the macro itself. Printing return value or errno here is wrong. It should really be something as: "fchownat(%i, '%s', ..., %i)", *(tc->fds), tc->filename, tc->flag > + } else { > + TST_EXP_FAIL(fchownat(*(tc->fds), tc->filenames, geteuid(), > + getegid(), tc->flag), tc->exp_errno, > + "fchownat() expected errno %d: %s", > + tc->exp_ret, strerror(tc->exp_errno)); ^ Here as well. > } > - > - cleanup(); > - tst_exit(); > } > > static void setup(void) > { > - if ((tst_kvercmp(2, 6, 16)) < 0) > - tst_brkm(TCONF, NULL, "This test needs kernel 2.6.16 or newer"); > - > - tst_sig(NOFORK, DEF_HANDLER, cleanup); > - > - TEST_PAUSE; > - > - tst_tmpdir(); > - > - dir_fd = SAFE_OPEN(cleanup, "./", O_DIRECTORY); > - > - SAFE_TOUCH(cleanup, TESTFILE, 0600, NULL); > - > - fd = SAFE_OPEN(cleanup, "testfile2", O_CREAT | O_RDWR, 0600); > -} > - > -static void fchownat_verify(const struct test_case_t *test) > -{ > - TEST(fchownat(*(test->fds), test->filenames, geteuid(), > - getegid(), test->flag)); > + dir_fd = SAFE_OPEN("./", O_DIRECTORY); > > - if (TEST_RETURN != test->exp_ret) { > - tst_resm(TFAIL | TTERRNO, > - "fchownat() returned %ld, expected %d, errno=%d", > - TEST_RETURN, test->exp_ret, test->exp_errno); > - return; > - } > + SAFE_TOUCH(TESTFILE, 0600, NULL); > > - if (TEST_ERRNO == test->exp_errno) { > - tst_resm(TPASS | TTERRNO, > - "fchownat() returned the expected errno %d: %s", > - test->exp_ret, strerror(test->exp_errno)); > - } else { > - tst_resm(TFAIL | TTERRNO, > - "fchownat() failed unexpectedly; expected: %d - %s", > - test->exp_errno, strerror(test->exp_errno)); > - } > + fd = SAFE_OPEN("testfile2", O_CREAT | O_RDWR, 0600); > } > > static void cleanup(void) > { > - if (fd > 0) > - close(fd); > + if (fd > 0) > + close(fd); > > - if (dir_fd > 0) > - close(dir_fd); > - > - tst_rmdir(); > + if (dir_fd > 0) > + close(dir_fd); These two should use SAFE_CLOSE() > } > + > +static struct tst_test test = { > + .tcnt = ARRAY_SIZE(tcases), > + .min_kver = "2.6.16", > + .test = verify_fchownat, > + .setup = setup, > + .cleanup = cleanup, > + .needs_tmpdir = 1, > +}; > -- > 2.20.1 > > > > > -- > Mailing list info: https://lists.linux.it/listinfo/ltp
diff --git a/testcases/kernel/syscalls/fchownat/fchownat.h b/testcases/kernel/syscalls/fchownat/fchownat.h index a95c26f93..75c435dab 100644 --- a/testcases/kernel/syscalls/fchownat/fchownat.h +++ b/testcases/kernel/syscalls/fchownat/fchownat.h @@ -1,20 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * 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 FCHOWNAT_H diff --git a/testcases/kernel/syscalls/fchownat/fchownat01.c b/testcases/kernel/syscalls/fchownat/fchownat01.c index 9f4ecded7..b18af54f4 100644 --- a/testcases/kernel/syscalls/fchownat/fchownat01.c +++ b/testcases/kernel/syscalls/fchownat/fchownat01.c @@ -1,60 +1,36 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) International Business Machines Corp., 2006 * AUTHOR: Yi Yang <yyangcdl@cn.ibm.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 Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* - * DESCRIPTION - * This test case will verify basic function of fchownat - * added by kernel 2.6.16 or up. + +/*\ + * [Description] + * + * This test case will verify basic function of fchownat + * added by kernel 2.6.16 or up. */ #define _GNU_SOURCE -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <unistd.h> -#include <stdlib.h> -#include <errno.h> -#include <string.h> -#include <signal.h> - -#include "test.h" -#include "safe_macros.h" +#include "tst_test.h" #include "fchownat.h" #include "lapi/fcntl.h" #define TESTFILE "testfile" -static void setup(void); -static void cleanup(void); - static int dir_fd; static int fd; static int no_fd = -1; static int cu_fd = AT_FDCWD; -static struct test_case_t { +static struct tcase { int exp_ret; int exp_errno; int flag; int *fds; char *filenames; -} test_cases[] = { +} tcases[] = { {0, 0, 0, &dir_fd, TESTFILE}, {-1, ENOTDIR, 0, &fd, TESTFILE}, {-1, EBADF, 0, &no_fd, TESTFILE}, @@ -62,77 +38,46 @@ static struct test_case_t { {0, 0, 0, &cu_fd, TESTFILE}, }; -char *TCID = "fchownat01"; -int TST_TOTAL = ARRAY_SIZE(test_cases); -static void fchownat_verify(const struct test_case_t *); - -int main(int ac, char **av) +static void verify_fchownat(unsigned int i) { - int lc; - int i; - - tst_parse_opts(ac, av, NULL, NULL); - - setup(); + struct tcase *tc = &tcases[i]; - for (lc = 0; TEST_LOOPING(lc); lc++) { - tst_count = 0; - for (i = 0; i < TST_TOTAL; i++) - fchownat_verify(&test_cases[i]); + if (tc->exp_ret == 0) { + TST_EXP_PASS(fchownat(*(tc->fds), tc->filenames, geteuid(), + getegid(), tc->flag), + "fchownat() returned %ld, expected %d, errno=%d", + TST_RET, tc->exp_ret, tc->exp_errno); + } else { + TST_EXP_FAIL(fchownat(*(tc->fds), tc->filenames, geteuid(), + getegid(), tc->flag), tc->exp_errno, + "fchownat() expected errno %d: %s", + tc->exp_ret, strerror(tc->exp_errno)); } - - cleanup(); - tst_exit(); } static void setup(void) { - if ((tst_kvercmp(2, 6, 16)) < 0) - tst_brkm(TCONF, NULL, "This test needs kernel 2.6.16 or newer"); - - tst_sig(NOFORK, DEF_HANDLER, cleanup); - - TEST_PAUSE; - - tst_tmpdir(); - - dir_fd = SAFE_OPEN(cleanup, "./", O_DIRECTORY); - - SAFE_TOUCH(cleanup, TESTFILE, 0600, NULL); - - fd = SAFE_OPEN(cleanup, "testfile2", O_CREAT | O_RDWR, 0600); -} - -static void fchownat_verify(const struct test_case_t *test) -{ - TEST(fchownat(*(test->fds), test->filenames, geteuid(), - getegid(), test->flag)); + dir_fd = SAFE_OPEN("./", O_DIRECTORY); - if (TEST_RETURN != test->exp_ret) { - tst_resm(TFAIL | TTERRNO, - "fchownat() returned %ld, expected %d, errno=%d", - TEST_RETURN, test->exp_ret, test->exp_errno); - return; - } + SAFE_TOUCH(TESTFILE, 0600, NULL); - if (TEST_ERRNO == test->exp_errno) { - tst_resm(TPASS | TTERRNO, - "fchownat() returned the expected errno %d: %s", - test->exp_ret, strerror(test->exp_errno)); - } else { - tst_resm(TFAIL | TTERRNO, - "fchownat() failed unexpectedly; expected: %d - %s", - test->exp_errno, strerror(test->exp_errno)); - } + fd = SAFE_OPEN("testfile2", O_CREAT | O_RDWR, 0600); } static void cleanup(void) { - if (fd > 0) - close(fd); + if (fd > 0) + close(fd); - if (dir_fd > 0) - close(dir_fd); - - tst_rmdir(); + if (dir_fd > 0) + close(dir_fd); } + +static struct tst_test test = { + .tcnt = ARRAY_SIZE(tcases), + .min_kver = "2.6.16", + .test = verify_fchownat, + .setup = setup, + .cleanup = cleanup, + .needs_tmpdir = 1, +};
Signed-off-by: tangmeng <tangmeng@uniontech.com> --- testcases/kernel/syscalls/fchownat/fchownat.h | 15 +- .../kernel/syscalls/fchownat/fchownat01.c | 131 +++++------------- 2 files changed, 39 insertions(+), 107 deletions(-) -- 2.20.1