TST_EXP_*() macros fixes
cover TST_EXP_*() macros fixes
Cyril Hrubis (3):
tst_test_macros: Fix TST_EXP_*() default message
tst_test_macros: Stringify early
tst_test_macros: Add test_macros05 tests
include/tst_test_macros.h | 40 ++++++++++++++------------- lib/newlib_tests/.gitignore | 1 + lib/newlib_tests/test_macros05.c | 46 ++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 19 deletions(-) create mode 100644 lib/newlib_tests/test_macros05.c
Signature · 1 line
2.31.1
PATCH 1/3 tst_test_macros: Fix TST_EXP_*() default message
We have to erase the last comma because otherwise we pass down one more empty parameter to the TST_EXP_*_() macros which then causes the FMT string to be empty and we end up with an empty default message.
Consider for example:
TST_EXP_FD(open(fname, O_RDONLY));
Before the patch it would produce:
foo.c:12: TPASS: returned fd 4
After it would produce:
foo.c:12: TPASS: open(fname, O_RDONLY) returned fd 4
--- include/tst_test_macros.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
include/tst_test_macros.h +8 -8
@@ -70,7 +70,7 @@ extern void *TST_RET_PTR;#define TST_EXP_POSITIVE (SCALL , ...) \ do { \ - TST_EXP_POSITIVE_(SCALL, __VA_ARGS__); \ + TST_EXP_POSITIVE_(SCALL, ##__VA_ARGS__); \ \ if (TST_PASS) { \ TST_MSGP_(TPASS, " returned %ld", \
@@ -78,22 +78,22 @@ extern void *TST_RET_PTR; } \ } while (0) -#define TST_EXP_FD_SILENT (SCALL , ...) TST_EXP_POSITIVE_(SCALL, __VA_ARGS__) +#define TST_EXP_FD_SILENT (SCALL , ...) TST_EXP_POSITIVE_(SCALL, ##__VA_ARGS__)#define TST_EXP_FD (SCALL , ...) \ do { \ - TST_EXP_FD_SILENT(SCALL, __VA_ARGS__); \ + TST_EXP_FD_SILENT(SCALL, ##__VA_ARGS__); \ \ if (TST_PASS) \ TST_MSGP_(TPASS, " returned fd %ld", TST_RET, \ #SCALL, ##__VA_ARGS__); \ } while (0) -#define TST_EXP_PID_SILENT (SCALL , ...) TST_EXP_POSITIVE_(SCALL, __VA_ARGS__) +#define TST_EXP_PID_SILENT (SCALL , ...) TST_EXP_POSITIVE_(SCALL, ##__VA_ARGS__)#define TST_EXP_PID (SCALL , ...) \ do { \ - TST_EXP_PID_SILENT(SCALL, __VA_ARGS__); \ + TST_EXP_PID_SILENT(SCALL, ##__VA_ARGS__); \ \ if (TST_PASS) \ TST_MSGP_(TPASS, " returned pid %ld", TST_RET, \
@@ -124,7 +124,7 @@ extern void *TST_RET_PTR;#define TST_EXP_PASS (SCALL , ...) \ do { \ - TST_EXP_PASS_SILENT(SCALL, __VA_ARGS__); \ + TST_EXP_PASS_SILENT(SCALL, ##__VA_ARGS__); \ \ if (TST_PASS) \ TST_MSG_(TPASS, " passed", #SCALL, ##__VA_ARGS__); \
@@ -158,8 +158,8 @@ extern void *TST_RET_PTR; } \ } while (0) -#define TST_EXP_FAIL (SCALL ,ERRNO , ...) TST_EXP_FAIL_(TST_RET == 0, SCALL, ERRNO, __VA_ARGS__) +#define TST_EXP_FAIL (SCALL ,ERRNO , ...) TST_EXP_FAIL_(TST_RET == 0, SCALL, ERRNO, ##__VA_ARGS__) -#define TST_EXP_FAIL2 (SCALL ,ERRNO , ...) TST_EXP_FAIL_(TST_RET >= 0, SCALL, ERRNO, __VA_ARGS__) +#define TST_EXP_FAIL2 (SCALL ,ERRNO , ...) TST_EXP_FAIL_(TST_RET >= 0, SCALL, ERRNO, ##__VA_ARGS__)#endif /* TST_TEST_MACROS_H__ */
Signature · 1 line
2.31.1
PATCH 1/3 tst_test_macros: Fix TST_EXP_*() default message
Quoted 4 lines · Cyril Hrubis
We have to erase the last comma because otherwise we pass down one more empty parameter to the TST_EXP_*_() macros which then causes the FMT string to be empty and we end up with an empty default message.
Patchset looks good from the code layer though it is a bit complicate in 2/3 stringify handling, but that should be acceptable.
My only hesitating is about ##__VA_ARGS__, because it says that is still as GNU's extension but have not got into standard C.
So I especially run with GitHub CI and got pretty compiling results, then I have
a positive attitude on applying these patches unless there is someone who blames it broken something in a general (but I guess the possibility is very little).
https://github.com/wangli5665/ltp/runs/3408080506
Feel free to add my reviews:
Signature · 5 lines
Regards, Li Wang -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.linux.it/pipermail/ltp/attachments/20210824/294f5d33/attachment.htm>
PATCH 1/3 tst_test_macros: Fix TST_EXP_*() default message
Hi!
Quoted 5 lines
Patchset looks good from the code layer though it is a bit complicate in 2/3 stringify handling, but that should be acceptable.
My only hesitating is about ##__VA_ARGS__, because it says that is still as GNU's extension but have not got into standard C.
Note that we have been using it in the header from the start. There were just a few places where it was missing, mostly in the variants that have been added later.
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH 1/3 tst_test_macros: Fix TST_EXP_*() default message
Quoted 11 lines · Cyril Hrubis
Hi!
Quoted 5 lines
Patchset looks good from the code layer though it is a bit complicate in 2/3 stringify handling, but that should be acceptable.
My only hesitating is about ##__VA_ARGS__, because it says that is still as GNU's extension but have not got into standard C.
Note that we have been using it in the header from the start. There were just a few places where it was missing, mostly in the variants that have been added later.
Ah great, I was neglect that point. Hence it should be safe enough.
Signature · 5 lines
Regards, Li Wang -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.linux.it/pipermail/ltp/attachments/20210824/e05904b8/attachment-0001.htm>
PATCH 1/3 tst_test_macros: Fix TST_EXP_*() default message
Hello,
Quoted 9 lines · Li Wang
Quoted 7 lines · Cyril Hrubis
Hi!
Quoted 5 lines
Patchset looks good from the code layer though it is a bit complicate in 2/3 stringify handling, but that should be acceptable.
My only hesitating is about ##__VA_ARGS__, because it says that is still as GNU's extension but have not got into standard C.
Quoted 10 lines
Quoted 4 lines
Note that we have been using it in the header from the start. There were just a few places where it was missing, mostly in the variants that have been added later.
Ah great, I was neglect that point. Hence it should be safe enough.
Signature · 2 lines
Regards, Li Wang
There is also __VA_OPT__(,) which can't be confused with concatenation.
I'm not sure we should use it thought, it seems like it was only recently added to other compilers. Still might be a good idea to link to the following page somewhere:
https://gcc.gnu.org/onlinedocs/cpp/Variadic-Macros.html#Variadic-Macros
LGTM otherwise!
Signature · 2 lines
Thank you, Richard.
PATCH 1/3 tst_test_macros: Fix TST_EXP_*() default message
In reply to Li WangHi Cyril, Li,
to whole patchset
Quoted 6 lines
So I especially run with GitHub CI and got pretty compiling results, then I have
a positive attitude on applying these patches unless there is someone who blames it broken something in a general (but I guess the possibility is very little).
https://github.com/wangli5665/ltp/runs/3408080506
Thanks! I've also tested it in github to catch things early.
Kind regards,
Petr
PATCH 1/3 tst_test_macros: Fix TST_EXP_*() default message
Hi!
Thanks for the reviews, pushed.
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH 2/3 tst_test_macros: Stringify early
In reply to Cyril HrubisWe have to stringify the SCALL argument early, otherwise it will be replaced in a case that it's a macro.
This is not fixing any hypotetical problem for instance the tst_syscall() is a macro. If we pass it to a TST_EXP_*() macro and keep it as a default message it will produce messy output.
Take for an example:
TST_EXP_FAIL(tst_sycall(__NR_foo, 1), EINVAL);
Before this patch it produces:
foo.c:12: TPASS: ({ int tst_ret; if (277 == -1) { (*__errno_location ()) = 38; tst_ret = -1; } else { tst_ret = syscall(277, 1); } if (tst_ret == -1 && (*__errno_location ()) == 38) { ({ do { ((void)sizeof(char[1 - 2 * !!(!((32) & (2 | 32 | 1)))])); } while (0); tst_brk_("foo.c", 12, (32), ("syscall(-1496763488) " "__NR_foo" " not supported"),277); }); } tst_ret; }) : EINVAL (22)
After this patch it will produce:
foo.c:12: TPASS: tst_syscall(__NR_foo, 1) : EINVAL (22)
--- include/tst_test_macros.h | 40 ++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-)
include/tst_test_macros.h +21 -19
@@ -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_POSITIVE_ (SCALL , ...) \ +#define TST_EXP_POSITIVE_ (SCALL ,SSCALL , ...) \ do { \ TEST(SCALL); \ \
@@ -54,13 +54,13 @@ extern void *TST_RET_PTR; \if (TST_RET ==-1 ) { \TST_MSG_ (TFAIL |TTERRNO ," failed" , \ -#SCALL , ##__VA_ARGS__); \ + SSCALL, ##__VA_ARGS__); \break ; \ } \ \if (TST_RET <0 ) { \TST_MSGP_ (TFAIL |TTERRNO ," invalid retval %ld" , \ - TST_RET, #SCALL, ##__VA_ARGS__); \ + TST_RET, SSCALL, ##__VA_ARGS__); \break ; \ } \ \
@@ -70,7 +70,7 @@ extern void *TST_RET_PTR;#define TST_EXP_POSITIVE (SCALL , ...) \ do { \ - TST_EXP_POSITIVE_(SCALL, ##__VA_ARGS__); \ + TST_EXP_POSITIVE_(SCALL, #SCALL, ##__VA_ARGS__); \ \ if (TST_PASS) { \ TST_MSGP_(TPASS, " returned %ld", \
@@ -78,29 +78,29 @@ extern void *TST_RET_PTR; } \ } while (0) -#define TST_EXP_FD_SILENT (SCALL , ...) TST_EXP_POSITIVE_(SCALL, ##__VA_ARGS__) +#define TST_EXP_FD_SILENT (SCALL , ...) TST_EXP_POSITIVE_(SCALL, #SCALL, ##__VA_ARGS__)#define TST_EXP_FD (SCALL , ...) \ do { \ - TST_EXP_FD_SILENT(SCALL, ##__VA_ARGS__); \ + TST_EXP_POSITIVE_(SCALL, #SCALL, ##__VA_ARGS__); \ \ if (TST_PASS) \ TST_MSGP_(TPASS, " returned fd %ld", TST_RET, \ #SCALL, ##__VA_ARGS__); \ } while (0) -#define TST_EXP_PID_SILENT (SCALL , ...) TST_EXP_POSITIVE_(SCALL, ##__VA_ARGS__) +#define TST_EXP_PID_SILENT (SCALL , ...) TST_EXP_POSITIVE_(SCALL, #SCALL, ##__VA_ARGS__)#define TST_EXP_PID (SCALL , ...) \ do { \ - TST_EXP_PID_SILENT(SCALL, ##__VA_ARGS__); \ + TST_EXP_POSITIVE_(SCALL, #SCALL, ##__VA_ARGS__); \ \ if (TST_PASS) \ TST_MSGP_(TPASS, " returned pid %ld", TST_RET, \ #SCALL, ##__VA_ARGS__); \ } while (0) -#define TST_EXP_PASS_SILENT (SCALL , ...) \ +#define TST_EXP_PASS_SILENT_ (SCALL ,SSCALL , ...) \ do { \ TEST(SCALL); \ \
@@ -108,13 +108,13 @@ extern void *TST_RET_PTR; \if (TST_RET ==-1 ) { \TST_MSG_ (TFAIL |TTERRNO ," failed" , \ -#SCALL , ##__VA_ARGS__); \ + SSCALL, ##__VA_ARGS__); \break ; \ } \ \if (TST_RET !=0 ) { \TST_MSGP_ (TFAIL |TTERRNO ," invalid retval %ld" , \ - TST_RET, #SCALL, ##__VA_ARGS__); \ + TST_RET, SSCALL, ##__VA_ARGS__); \break ; \ } \ \
@@ -122,44 +122,46 @@ extern void *TST_RET_PTR; \ } while (0) +#define TST_EXP_PASS_SILENT (SCALL , ...) TST_EXP_PASS_SILENT_(SCALL, #SCALL, ##__VA_ARGS__) +#define TST_EXP_PASS (SCALL , ...) \ do { \ - TST_EXP_PASS_SILENT(SCALL, ##__VA_ARGS__); \ + TST_EXP_PASS_SILENT_(SCALL, #SCALL, ##__VA_ARGS__); \ \ if (TST_PASS) \ TST_MSG_(TPASS, " passed", #SCALL, ##__VA_ARGS__); \ } while (0) \ -#define TST_EXP_FAIL_ (PASS_COND ,SCALL ,ERRNO , ...) \ +#define TST_EXP_FAIL_ (PASS_COND ,SCALL ,SSCALL ,ERRNO , ...) \ do { \ TEST(SCALL); \ \ TST_PASS = 0; \ \ if (PASS_COND) { \ - TST_MSG_(TFAIL, " succeeded", #SCALL, ##__VA_ARGS__); \ + TST_MSG_(TFAIL, " succeeded", SSCALL, ##__VA_ARGS__); \ break; \ } \ \ if (TST_RET != -1) { \ TST_MSGP_(TFAIL | TTERRNO, " invalid retval %ld", \ - TST_RET, #SCALL, ##__VA_ARGS__); \ + TST_RET, SSCALL, ##__VA_ARGS__); \ break; \ } \ \ if (TST_ERR == ERRNO) { \ TST_MSG_(TPASS | TTERRNO, " ", \ - #SCALL, ##__VA_ARGS__); \ + SSCALL, ##__VA_ARGS__); \ TST_PASS = 1; \ } else { \ TST_MSGP_(TFAIL | TTERRNO, " expected %s", \ tst_strerrno(ERRNO), \ - #SCALL, ##__VA_ARGS__); \ + SSCALL, ##__VA_ARGS__); \ } \ } while (0) -#define TST_EXP_FAIL (SCALL ,ERRNO , ...) TST_EXP_FAIL_(TST_RET == 0, SCALL, ERRNO, ##__VA_ARGS__) +#define TST_EXP_FAIL (SCALL ,ERRNO , ...) TST_EXP_FAIL_(TST_RET == 0, SCALL, #SCALL, ERRNO, ##__VA_ARGS__) -#define TST_EXP_FAIL2 (SCALL ,ERRNO , ...) TST_EXP_FAIL_(TST_RET >= 0, SCALL, ERRNO, ##__VA_ARGS__) +#define TST_EXP_FAIL2 (SCALL ,ERRNO , ...) TST_EXP_FAIL_(TST_RET >= 0, SCALL, #SCALL, ERRNO, ##__VA_ARGS__)#endif /* TST_TEST_MACROS_H__ */
Signature · 1 line
2.31.1
PATCH 3/3 tst_test_macros: Add test_macros05 tests
In reply to Cyril HrubisThat tests the two corner cases with default message and macro stringification.
--- lib/newlib_tests/.gitignore | 1 + lib/newlib_tests/test_macros05.c | 46 ++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 lib/newlib_tests/test_macros05.c
lib/newlib_tests/.gitignore +1 -0
@@ -41,6 +41,7 @@ test_macros01 test_macros02 test_macros03 test_macros04 +test_macros05 tst_fuzzy_sync01 tst_fuzzy_sync02 tst_fuzzy_sync03
lib/newlib_tests/test_macros05.c new file +46 -0
46 lines not on this page · raw message
Signature · 1 line
2.31.1