syscalls/open01.c: Don't continue when open() failed
PATCH 1/2 syscalls/open01.c: Don't continue when open() failed
Avoid calling fstat() with invalid fd:
-------------------------------------------
./open01
...
open01.c:53: TBROK: fstat(-1,0x7fff731410a0) failed: EBADF (9)
-------------------------------------------
--- testcases/kernel/syscalls/open/open01.c | 3 +++ 1 file changed, 3 insertions(+)
testcases/kernel/syscalls/open/open01.c +3 -0
@@ -47,6 +47,9 @@ static void verify_open(unsigned int n)TST_EXP_FD (open (tc->filename, tc->flag, tc->mode),"open() with %s" , tc->desc); +if (!TST_PASS ) +return ; + fd =TST_RET ;SAFE_FSTAT (fd, &buf);
Signature · 1 line
2.21.0
RFC PATCH 2/2 include/tst_test_macros.h: Report TINFO when TST_EXP_FD() succeeded
In Summary output, avoid counting the double passed for one test:
-------------------------------------
./open01
tst_test.c:1261: TINFO: Timeout per run is 0h 05m 00s open01.c:48: TPASS: open() with sticky bit returned fd 3 open01.c:59: TPASS: sticky bit is set as expected open01.c:48: TPASS: open() with sirectory bit returned fd 3 open01.c:59: TPASS: sirectory bit is set as expected
Summary:
passed 4 failed 0 broken 0 skipped 0
warnings 0
-------------------------------------
--- include/tst_test_macros.h | 2 +- lib/newlib_tests/test_macros01.c | 3 ++- testcases/kernel/syscalls/open/open11.c | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-)
include/tst_test_macros.h +1 -1
@@ -64,7 +64,7 @@ extern void *TST_RET_PTR;break ; \ } \ \ -TST_MSGP_ (TPASS ," returned fd %ld" ,TST_RET , \ +TST_MSGP_ (TINFO ," returned fd %ld" ,TST_RET , \ #SCALL, ##__VA_ARGS__); \ \TST_PASS =1 ; \
lib/newlib_tests/test_macros01.c +2 -1
@@ -30,7 +30,8 @@ static void do_test(void)TST_EXP_FD (fail_fd (),"TEST DESCRIPTION" );tst_res (TINFO ,"TST_PASS = %i" ,TST_PASS );TST_EXP_FD (pass_fd (),"%s" ,"TEST DESCRIPTION PARAM" ); -tst_res (TINFO ,"TST_PASS = %i" ,TST_PASS ); +if (TST_PASS ) +tst_res (TPASS ,"TST_PASS = %i" ,TST_PASS );TST_EXP_FD (inval_val ());tst_res (TINFO ,"TST_PASS = %i" ,TST_PASS ); }
testcases/kernel/syscalls/open/open11.c +2 -0
@@ -283,6 +283,8 @@ static void verify_open(unsigned int n) }else if (tc[n].err ==0 ) {TST_EXP_FD (open (tc[n].path, tc[n].flags, tc[n].mode),"%s" , tc[n].desc); +if (TST_PASS ) +tst_res (TPASS ,"%s" , tc[n].desc); }else {TEST (open (tc[n].path, tc[n].flags, tc[n].mode));tst_res (TPASS ,"%s" , tc[n].desc);
Signature · 1 line
2.21.0
RFC PATCH 2/2 include/tst_test_macros.h: Report TINFO when TST_EXP_FD() succeeded
Hi Cyril,
I will change the TST_EXP_PASS as well if you approve the patch.
Best Regards,
Xiao Yang
Quoted 64 lines · Xiao Yang
In Summary output, avoid counting the double passed for one test:
-------------------------------------
./open01
tst_test.c:1261: TINFO: Timeout per run is 0h 05m 00s open01.c:48: TPASS:open()with sticky bit returned fd 3 open01.c:59: TPASS: sticky bit is set as expected open01.c:48: TPASS:open()with sirectory bit returned fd 3 open01.c:59: TPASS: sirectory bit is set as expectedSummary:
passed 4 failed 0 broken 0 skipped 0warnings 0
-------------------------------------Signed-off-by Xiao Yang <[email protected]>--- include/tst_test_macros.h | 2 +- lib/newlib_tests/test_macros01.c | 3 ++- testcases/kernel/syscalls/open/open11.c | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-)include/tst_test_macros.h +1
-1@@ -64,7 +64,7 @@ extern void *TST_RET_PTR;break ; \ } \ \ -TST_MSGP_ (TPASS ," returned fd %ld" ,TST_RET , \ +TST_MSGP_ (TINFO ," returned fd %ld" ,TST_RET , \ #SCALL, ##__VA_ARGS__); \ \TST_PASS =1 ; \lib/newlib_tests/test_macros01.c +2
-1@@ -30,7 +30,8 @@ static void do_test(void)TST_EXP_FD (fail_fd (),"TEST DESCRIPTION" );tst_res (TINFO ,"TST_PASS = %i" ,TST_PASS );TST_EXP_FD (pass_fd (),"%s" ,"TEST DESCRIPTION PARAM" ); -tst_res (TINFO ,"TST_PASS = %i" ,TST_PASS ); +if (TST_PASS ) +tst_res (TPASS ,"TST_PASS = %i" ,TST_PASS );TST_EXP_FD (inval_val ());tst_res (TINFO ,"TST_PASS = %i" ,TST_PASS ); }testcases/kernel/syscalls/open/open11.c +2
-0@@ -283,6 +283,8 @@ static void verify_open(unsigned int n) }else if (tc[n].err ==0 ) {TST_EXP_FD (open (tc[n].path, tc[n].flags, tc[n].mode),"%s" , tc[n].desc); +if (TST_PASS ) +tst_res (TPASS ,"%s" , tc[n].desc); }else {TEST (open (tc[n].path, tc[n].flags, tc[n].mode));tst_res (TPASS ,"%s" , tc[n].desc);
RFC PATCH 2/2 include/tst_test_macros.h: Report TINFO when TST_EXP_FD() succeeded
Hi!
Quoted 1 line
I will change the
TST_EXP_PASSas well if you approve the patch.
Please do not. The very purpose of TST_EXP_PASS() is to produce TFAIL or TPASS.
Signature · 2 lines
Cyril Hrubis [email protected]
RFC PATCH 2/2 include/tst_test_macros.h: Report TINFO when TST_EXP_FD() succeeded
In reply to Xiao YangHi!
Quoted 9 lines
In Summary output, avoid counting the double passed for one test:
-------------------------------------
./open01
tst_test.c:1261: TINFO: Timeout per run is 0h 05m 00s open01.c:48: TPASS:open()with sticky bit returned fd 3 open01.c:59: TPASS: sticky bit is set as expected open01.c:48: TPASS:open()with sirectory bit returned fd 3 open01.c:59: TPASS: sirectory bit is set as expected
Quoted 7 lines
Summary:
passed 4 failed 0 broken 0 skipped 0warnings 0
-------------------------------------
What exactly is the problem of having TPASS generated for each open() that produces a valid file descriptor in the open testcases?
These macros are especially tailored to generate TPASS/TFAIL messages so that the caller does not have to. So even if having two TPASS per run() function in open01 was a problem, which I do not think is the case, we should just use SAFE_OPEN() there instead.
Signature · 2 lines
Cyril Hrubis [email protected]
RFC PATCH 2/2 include/tst_test_macros.h: Report TINFO when TST_EXP_FD() succeeded
Quoted 17 lines · Cyril Hrubis
Hi!
Quoted 9 lines
In Summary output, avoid counting the double passed for one test:
-------------------------------------
./open01
tst_test.c:1261: TINFO: Timeout per run is 0h 05m 00s open01.c:48: TPASS:open()with sticky bit returned fd 3 open01.c:59: TPASS: sticky bit is set as expected open01.c:48: TPASS:open()with sirectory bit returned fd 3 open01.c:59: TPASS: sirectory bit is set as expectedQuoted 7 lines
Summary:
passed 4 failed 0 broken 0 skipped 0warnings 0
-------------------------------------
Quoted 7 lines
What exactly is the problem of having TPASS generated for each
open()that produces a valid file descriptor in the open testcases?These macros are especially tailored to generate TPASS/TFAIL messages so that the caller does not have to. So even if having two TPASS per
run()function in open01 was a problem, which I do not think is the case, we should just useSAFE_OPEN()there instead.
Hi Cyril,
I perfer to report one TPASS message when finishing one subtest instead of one step.
because of two reasons:
a) It seems clearer for user to know how many subtests were run
sucessfully.
b) There are too many TPASS/TFAIL messages when a testcase(e.g.
open11) contains many subtests or multiple TST_EXP_* macros. Could we make TST_EXP_* macros do common check and generate only TFAIL messages? (Make testcases report TPASS message by themself)
Best Regards,
Xiao Yang
RFC PATCH 2/2 include/tst_test_macros.h: Report TINFO when TST_EXP_FD() succeeded
Hi!
Quoted 7 lines
Quoted 7 lines
What exactly is the problem of having TPASS generated for each
open()that produces a valid file descriptor in the open testcases?These macros are especially tailored to generate TPASS/TFAIL messages so that the caller does not have to. So even if having two TPASS per
run()function in open01 was a problem, which I do not think is the case, we should just useSAFE_OPEN()there instead.
Quoted 7 lines
Hi Cyril,
I perfer to report one TPASS message when finishing one subtest instead of one step.
because of two reasons:
a) It seems clearer for user to know how many subtests were run
sucessfully.
This depends on a definition of subtest which, as far as I can tell, is not that well defined.
If you want to make the output easier to read in the case of a test function that is called more than once we should change the test library to insert empty lines between the iterations or something along these lines, so that the output would look like:
./open01
tst_test.c:1261: TINFO: Timeout per run is 0h 05m 00s
open01.c:48: TPASS: open() with sticky bit returned fd 3 open01.c:56: TPASS: sticky bit is set as expected
open01.c:48: TPASS: open() with sirectory bit returned fd 3 open01.c:56: TPASS: sirectory bit is set as expected
Summary:
passed 4 failed 0 broken 0 skipped 0
warnings 0
Which is way better than imposing any rules on how many TPASS/TFAIL messages should be printed per iteration.
Quoted 2 lines
b) There are too many TPASS/TFAIL messages when a testcase(e.g.
open11) contains many subtests or multiple TST_EXP_* macros.
There are 28 testcases in open11 and we print 28 messages TPASS/TFAIL messages, we just use different EXP macro for different testcases. I do not think that silencing the output would make things any better.
Quoted 2 lines
Could we make TST_EXP_* macros do common check and generate only TFAIL messages? (Make testcases report TPASS message by themself)
The whole idea of having the TST_EXP_* macros is that they replace code that looks like:
if (condition) tst_res(TPASS, "..."); else tst_res(TFAIL, "...");
And that they actually unify how these messages are formatted.
If you think that there are places where we use these macros where SAFE_MACRO() would be better we can talk about changing these.
Signature · 2 lines
Cyril Hrubis [email protected]
RFC PATCH v2 1/2 include/tst_test_macros.h: Add TST_EXP_SILENT_{PASS, FD} macros
1) TST_EXP_SILENT_{PASS,FD} don't report TPASS when SCALL succeeds.
2) TST_EXP_{PASS,FD} calls TST_EXP_SILENT_{PASS,FD} and report TPASS when SCALL succeeds.
--- include/tst_test_macros.h | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-)
include/tst_test_macros.h +18 -7
@@ -46,7 +46,7 @@ extern void *TST_RET_PTR;tst_res_ (__FILE__, __LINE__,RES , \ TST_FMT_(TST_2_(dummy, ##__VA_ARGS__, SCALL) FMT, __VA_ARGS__), PAR) -#define TST_EXP_FD (SCALL , ...) \ +#define TST_EXP_SILENT_FD (SCALL , ...) \ do { \ TEST(SCALL); \ \
@@ -64,14 +64,20 @@ extern void *TST_RET_PTR;break ; \ } \ \ - TST_MSGP_(TPASS, " returned fd %ld", TST_RET, \ -#SCALL , ##__VA_ARGS__); \ - \TST_PASS =1 ; \ \ } while (0) -#define TST_EXP_PASS (SCALL , ...) \ +#define TST_EXP_FD (SCALL , ...) \ + do { \ + TST_EXP_SILENT_FD(SCALL, __VA_ARGS__); \ + \ + if (TST_PASS) \ + TST_MSGP_(TPASS, " returned fd %ld", TST_RET, \ + #SCALL, ##__VA_ARGS__); \ + } while (0) + +#define TST_EXP_SILENT_PASS (SCALL , ...) \ do { \ TEST(SCALL); \ \
@@ -89,12 +95,17 @@ extern void *TST_RET_PTR;break ; \ } \ \ - TST_MSG_(TPASS, " passed", #SCALL, ##__VA_ARGS__); \ - \TST_PASS =1 ; \ \ } while (0) +#define TST_EXP_PASS (SCALL , ...) \ + do { \ + TST_EXP_SILENT_PASS(SCALL, __VA_ARGS__); \ + \ + if (TST_PASS) \ + TST_MSG_(TPASS, " passed", #SCALL, ##__VA_ARGS__); \ + } while (0) \#define TST_EXP_FAIL (SCALL ,ERRNO , ...) \ do { \
Signature · 1 line
2.21.0
RFC PATCH v2 2/2 syscalls/access02.c: Take use of TST_EXP_SILENT_PASS
Current TST_EXP_PASS macro reports the double passed for one subtest:
--------------------------------------------
tst_test.c:1261: TINFO: Timeout per run is 0h 05m 00s access02.c:62: TPASS: access(file_f, F_OK) as root passed access02.c:141: TPASS: access(file_f, F_OK) as root behaviour is correct.
--------------------------------------------
It is just a minor cleanup rather than a fix.
--- testcases/kernel/syscalls/access/access02.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
testcases/kernel/syscalls/access/access02.c +1 -1
@@ -59,7 +59,7 @@ static void access_test(struct tcase *tc, const char *user)struct stat stat_buf;char command[64 ]; -TST_EXP_PASS (access (tc->pathname, tc->mode), +TST_EXP_SILENT_PASS (access (tc->pathname, tc->mode),"access(%s, %s) as %s" , tc->pathname, tc->name, user);if (!TST_PASS )
Signature · 1 line
2.21.0
RFC PATCH v2 1/2 include/tst_test_macros.h: Add TST_EXP_SILENT_{PASS, FD} macros
In reply to Xiao YangHi!
Quoted 3 lines
1) TST_EXP_SILENT_{PASS,FD} don't report TPASS when SCALL succeeds.
2) TST_EXP_{PASS,FD} calls TST_EXP_SILENT_{PASS,FD} and report TPASS when SCALL succeeds.
I think that the macros should have the silent after the {PASS,FD} since that would be less confusing. I other words what is silent fd?
So I would name these as TST_EXP_FD_SILENT() or maybe TST_EXP_FD_QUIET().
Other than that the change looks good.
Quoted 68 lines
Signed-off-by Xiao Yang <[email protected]>--- include/tst_test_macros.h | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-)include/tst_test_macros.h +18
-7@@ -46,7 +46,7 @@ extern void *TST_RET_PTR;tst_res_ (__FILE__, __LINE__,RES , \ TST_FMT_(TST_2_(dummy, ##__VA_ARGS__, SCALL) FMT, __VA_ARGS__), PAR) -#define TST_EXP_FD (SCALL , ...) \ +#define TST_EXP_SILENT_FD (SCALL , ...) \ do { \ TEST(SCALL); \ \@@ -64,14 +64,20 @@ extern void *TST_RET_PTR;break ; \ } \ \ - TST_MSGP_(TPASS, " returned fd %ld", TST_RET, \ -#SCALL , ##__VA_ARGS__); \ - \TST_PASS =1 ; \ \ } while (0) -#define TST_EXP_PASS (SCALL , ...) \ +#define TST_EXP_FD (SCALL , ...) \ + do { \ + TST_EXP_SILENT_FD(SCALL, __VA_ARGS__); \ + \ + if (TST_PASS) \ + TST_MSGP_(TPASS, " returned fd %ld", TST_RET, \ + #SCALL, ##__VA_ARGS__); \ + } while (0) + +#define TST_EXP_SILENT_PASS (SCALL , ...) \ do { \ TEST(SCALL); \ \@@ -89,12 +95,17 @@ extern void *TST_RET_PTR;break ; \ } \ \ - TST_MSG_(TPASS, " passed", #SCALL, ##__VA_ARGS__); \ - \TST_PASS =1 ; \ \ } while (0) +#define TST_EXP_PASS (SCALL , ...) \ + do { \ + TST_EXP_SILENT_PASS(SCALL, __VA_ARGS__); \ + \ + if (TST_PASS) \ + TST_MSG_(TPASS, " passed", #SCALL, ##__VA_ARGS__); \ + } while (0) \#define TST_EXP_FAIL (SCALL ,ERRNO , ...) \ do { \Signature · 1 line
2.21.0
Signature · 2 lines
Cyril Hrubis [email protected]
RFC PATCH 2/2 include/tst_test_macros.h: Report TINFO when TST_EXP_FD() succeeded
In reply to Cyril HrubisHi Cyril,
Sorry for the late reply because I am busy with other things recently.
Quoted 39 lines · Cyril Hrubis
Hi!
Quoted 7 lines
Quoted 7 lines
What exactly is the problem of having TPASS generated for each
open()that produces a valid file descriptor in the open testcases?These macros are especially tailored to generate TPASS/TFAIL messages so that the caller does not have to. So even if having two TPASS per
run()function in open01 was a problem, which I do not think is the case, we should just useSAFE_OPEN()there instead.Quoted 7 lines
Hi Cyril,
I perfer to report one TPASS message when finishing one subtest instead of one step.
because of two reasons:
a) It seems clearer for user to know how many subtests were run
sucessfully.This depends on a definition of subtest which, as far as I can tell, is not that well defined.
If you want to make the output easier to read in the case of a test function that is called more than once we should change the test library to insert empty lines between the iterations or something along these lines, so that the output would look like:
./open01
tst_test.c:1261: TINFO: Timeout per run is 0h 05m 00sopen01.c:48: TPASS:
open()with sticky bit returned fd 3 open01.c:56: TPASS: sticky bit is set as expectedopen01.c:48: TPASS:
open()with sirectory bit returned fd 3 open01.c:56: TPASS: sirectory bit is set as expectedSummary:
passed 4 failed 0 broken 0 skipped 0warnings 0
Quoted 8 lines
Which is way better than imposing any rules on how many TPASS/TFAIL messages should be printed per iteration.
Quoted 2 lines
b) There are too many TPASS/TFAIL messages when a testcase(e.g.
open11) contains many subtests or multiple TST_EXP_* macros.There are 28 testcases in open11 and we print 28 messages TPASS/TFAIL messages, we just use different EXP macro for different testcases. I do not think that silencing the output would make things any better.
I gave a wrong example. access02 may be the correct one:
-----------------------------------------------------------------
# ./access02 tst_test.c:1261: TINFO: Timeout per run is 0h 05m 00s access02.c:62: TPASS: access(file_f, F_OK) as root passed access02.c:141: TPASS: access(file_f, F_OK) as root behaviour is correct. access02.c:62: TPASS: access(file_f, F_OK) as nobody passed access02.c:141: TPASS: access(file_f, F_OK) as nobody behaviour is correct. access02.c:62: TPASS: access(file_r, R_OK) as root passed access02.c:141: TPASS: access(file_r, R_OK) as root behaviour is correct. access02.c:62: TPASS: access(file_r, R_OK) as nobody passed access02.c:141: TPASS: access(file_r, R_OK) as nobody behaviour is correct. ...
Summary:
passed 32 failed 0 broken 0 skipped 0
warnings 0
-----------------------------------------------------------------
Quoted 10 lines
Quoted 2 lines
Could we make TST_EXP_* macros do common check and generate only TFAIL messages? (Make testcases report TPASS message by themself)
The whole idea of having the TST_EXP_* macros is that they replace code that looks like:
if (condition) tst_res(TPASS, "..."); else tst_res(TFAIL, "...");
Quoted 4 lines
And that they actually unify how these messages are formatted.
If you think that there are places where we use these macros where
SAFE_MACRO()would be better we can talk about changing these.
I thought about it again yesterday and wanted to introduce new TST_EXP_ SILENT_{FD,PASS} macros.
1) TST_EXP_SILENT_{PASS,FD} do common checks and don't report TPASS when SCALL succeeds.
2) TST_EXP_{PASS,FD} take use of TST_EXP_SILENT_{PASS,FD} and report TPASS when SCALL succeeds.
BTW: Make testcase use which macros by themselves.
Please see my v2 patch set for detailed implement:
http://lists.linux.it/pipermail/ltp/2021-January/020472.html
http://lists.linux.it/pipermail/ltp/2021-January/020473.html
Best Regards,
Xiao Yang
PATCH 1/2 syscalls/open01.c: Don't continue when open() failed
In reply to Xiao YangHi!
Quoted 17 lines
Avoid calling
fstat()with invalid fd:
-------------------------------------------
./open01
...
open01.c:53: TBROK:fstat(-1,0x7fff731410a0)failed: EBADF (9)
-------------------------------------------Signed-off-by Xiao Yang <[email protected]>--- testcases/kernel/syscalls/open/open01.c | 3 +++ 1 file changed, 3 insertions(+)testcases/kernel/syscalls/open/open01.c +0
-0
testcases/kernel/syscalls/open/open01.c static void verify_open(unsigned int n) · line 52
Quoted 6 lines
testcases/kernel/syscalls/open/open01.c +3
-0@@ -47,6 +47,9 @@ static void verify_open(unsigned int n)TST_EXP_FD (open (tc->filename, tc->flag, tc->mode),"open() with %s" , tc->desc); +if (!TST_PASS ) +return ; +
Doesn't this only happen if the open() that is supposed to return a valid file descriptor fails unexpectedly? In that the test fails, right?
But I guess that it does not harm, so:
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH 1/2 syscalls/open01.c: Don't continue when open() failed
Quoted 19 lines · Cyril Hrubis
Hi!
Quoted 18 lines
Avoid calling
fstat()with invalid fd:
-------------------------------------------
./open01
...
open01.c:53: TBROK:fstat(-1,0x7fff731410a0)failed: EBADF (9)
-------------------------------------------Signed-off-by Xiao Yang<[email protected]>--- testcases/kernel/syscalls/open/open01.c | 3 +++ 1 file changed, 3 insertions(+)testcases/kernel/syscalls/open/open01.c +0
-0@@ -47,6 +47,9 @@ static void verify_open(unsigned int n)
Quoted 7 lines
testcases/kernel/syscalls/open/open01.c static void verify_open(unsigned int n) · line 52
Quoted 5 lines
testcases/kernel/syscalls/open/open01.c +3
-0TST_EXP_FD (open (tc->filename, tc->flag, tc->mode),"open() with %s" , tc->desc); +if (!TST_PASS ) +return ; +Doesn't this only happen if the
open()that is supposed to return a valid file descriptor fails unexpectedly? In that the test fails, right?
Hi Cyril,
Right.
Quoted 3 lines
But I guess that it does not harm, so:
Acked-by Cyril Hrubis<[email protected]>
I will push it soon.
Best Regards,
Xiao Yang