fix make check errors: replace space with tabs, remove unecessary spaces.
PATCH 2/3 fix make check warnings: use octal permission.
In reply to lufeiReplace symbolic permission with octal.
--- testcases/kernel/syscalls/acct/acct01.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
testcases/kernel/syscalls/acct/acct01.c +1 -2
@@ -25,8 +25,7 @@#include "tst_test.h" -#define DIR_MODE (S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP| \ - S_IXGRP|S_IROTH|S_IXOTH) +#define DIR_MODE 0755#define FILE_EISDIR "."#define FILE_EACCESS "/dev/null"#define FILE_ENOENT "/tmp/does/not/exist"
Signature · 5 lines
2.39.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH 1/3 fix make check errors: replace space with tabs, remove unecessary spaces.
replace space with tabs, remove unecessary spaces.
--- testcases/kernel/syscalls/acct/acct01.c | 6 +++--- testcases/kernel/syscalls/acct/acct02.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
testcases/kernel/syscalls/acct/acct01.c +3 -3
@@ -73,8 +73,8 @@ static struct test_case {char **filename;char *desc;int exp_errno; -void (*setupfunc) (); -void (*cleanfunc) (); +void (*setupfunc)(); +void (*cleanfunc)(); } tcases[] = { {&file_eisdir, FILE_EISDIR, EISDIR, NULL, NULL}, {&file_eaccess, FILE_EACCESS, EACCES, NULL, NULL},
@@ -126,7 +126,7 @@ static void verify_acct(unsigned int nr) tcase->setupfunc ();TST_EXP_FAIL (acct (*tcase->filename), tcase->exp_errno, -"acct(%s)" , tcase->desc); +"acct(%s)" , tcase->desc);if (tcase->cleanfunc) tcase->cleanfunc ();
testcases/kernel/syscalls/acct/acct02.c +1 -1
@@ -186,7 +186,7 @@ static void run(void)if (read_bytes != acct_size) {tst_res (TFAIL ,"incomplete read %i bytes, expected %i" , - read_bytes, acct_size); + read_bytes, acct_size); goto exit; }
Signature · 5 lines
2.39.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH 3/3 fix make check warning: using .needs_kconfigs instead of ENOSYS
Replace ENOSYS with .needs_kconfigs CONFIG_BSD_PROCESS_ACCT=y
--- testcases/kernel/syscalls/acct/acct01.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
testcases/kernel/syscalls/acct/acct01.c +3 -2
@@ -92,8 +92,6 @@ static void setup(void)int fd;TEST (acct (NULL )); -if (TST_RET ==-1 &&TST_ERR ==ENOSYS ) -tst_brk (TCONF ,"acct() system call isn't configured in kernel" ); ltpuser =SAFE_GETPWNAM ("nobody" );
@@ -148,5 +146,8 @@ static struct tst_test test = { {&file_enametoolong, .size = PATH_MAX+2}, {&file_erofs, .str = FILE_EROFS}, {} + }, + .needs_kconfigs = (const char *[]) { +"CONFIG_BSD_PROCESS_ACCT=y" , } };
Signature · 5 lines
2.39.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi!
Thanks, pushed.
Kind regards,
Andrea Cervesato
Quoted 45 lines · lufei
replace space with tabs, remove unecessary spaces.
Signed-off-by lufei <[email protected]>--- testcases/kernel/syscalls/acct/acct01.c | 6 +++--- testcases/kernel/syscalls/acct/acct02.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)testcases/kernel/syscalls/acct/acct01.c +3
-3@@ -73,8 +73,8 @@ static struct test_case {char **filename;char *desc;int exp_errno; -void (*setupfunc) (); -void (*cleanfunc) (); +void (*setupfunc)(); +void (*cleanfunc)(); } tcases[] = { {&file_eisdir, FILE_EISDIR, EISDIR, NULL, NULL}, {&file_eaccess, FILE_EACCESS, EACCES, NULL, NULL},@@ -126,7 +126,7 @@ static void verify_acct(unsigned int nr) tcase->setupfunc ();TST_EXP_FAIL (acct (*tcase->filename), tcase->exp_errno, -"acct(%s)" , tcase->desc); +"acct(%s)" , tcase->desc);if (tcase->cleanfunc) tcase->cleanfunc ();testcases/kernel/syscalls/acct/acct02.c +1
-1@@ -186,7 +186,7 @@ static void run(void)if (read_bytes != acct_size) {tst_res (TFAIL ,"incomplete read %i bytes, expected %i" , - read_bytes, acct_size); + read_bytes, acct_size); goto exit; }
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH 3/3] fix make check warning: using .needs_kconfigs instead of ENOSYS
In reply to lufeiHi all,
Quoted 21 lines
Replace ENOSYS with .needs_kconfigs
CONFIG_BSD_PROCESS_ACCT=ySigned-off-by lufei <[email protected]>--- testcases/kernel/syscalls/acct/acct01.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)testcases/kernel/syscalls/acct/acct01.c +0
-2@@ -92,8 +92,6 @@ static void setup(void)int fd;TEST (acct (NULL )); -if (TST_RET ==-1 &&TST_ERR ==ENOSYS ) -tst_brk (TCONF ,"acct() system call isn't configured in kernel" ); ltpuser =SAFE_GETPWNAM ("nobody" );
testcases/kernel/syscalls/acct/acct01.c static struct tst_test test = { · line 153
Quoted 8 lines
testcases/kernel/syscalls/acct/acct01.c +3
-0@@ -148,5 +146,8 @@ static struct tst_test test = { {&file_enametoolong, .size = PATH_MAX+2}, {&file_erofs, .str = FILE_EROFS}, {} + }, + .needs_kconfigs = (const char *[]) { +"CONFIG_BSD_PROCESS_ACCT=y" , } };
For a record, the warning was:
acct01.c:95: WARNING: ENOSYS means 'invalid syscall nr' and nothing else
This is relevant for kernel code, but not for LTP.
We in the past tried to avoid on kernel configs. Now we on many places use .needs_kconfigs. Does it mean we just request kernel config? Nobody complained about it and .needs_kconfigs is kind of documentation, but still I hope that there aren't many quiet users who see many TCONF. Due this reason I think twice before I add .needs_kconfigs, specially when ENOSYS is valid detection we use in tst_syscall().
lib/tst_test.c
if (tst_test->needs_kconfigs && tst_kconfig_check(tst_test->needs_kconfigs)) tst_brk(TCONF, "Aborting due to unsuitable kernel config, see above!");
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp