From: Cyril Hrubis <chrubis@suse.cz>
To: ltp@lists.linux.it
Subject: [LTP] [PATCH 2/3] tst_test_macros: Stringify early
Date: Mon, 23 Aug 2021 17:05:19 +0200 [thread overview]
Message-ID: <20210823150520.25614-3-chrubis@suse.cz> (raw)
In-Reply-To: <20210823150520.25614-1-chrubis@suse.cz>
We 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)
Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
---
include/tst_test_macros.h | 40 ++++++++++++++++++++-------------------
1 file changed, 21 insertions(+), 19 deletions(-)
diff --git a/include/tst_test_macros.h b/include/tst_test_macros.h
index ecc612b0d..50598aa15 100644
--- a/include/tst_test_macros.h
+++ b/include/tst_test_macros.h
@@ -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__ */
--
2.31.1
next prev parent reply other threads:[~2021-08-23 15:05 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-23 15:05 [LTP] [PATCH 0/3] TST_EXP_*() macros fixes Cyril Hrubis
2021-08-23 15:05 ` [LTP] [PATCH 1/3] tst_test_macros: Fix TST_EXP_*() default message Cyril Hrubis
2021-08-24 7:35 ` Li Wang
2021-08-24 8:48 ` Cyril Hrubis
2021-08-24 9:29 ` Li Wang
2021-08-24 12:46 ` Richard Palethorpe
2021-08-24 11:48 ` Petr Vorel
2021-08-24 13:37 ` Cyril Hrubis
2021-08-23 15:05 ` Cyril Hrubis [this message]
2021-08-23 15:05 ` [LTP] [PATCH 3/3] tst_test_macros: Add test_macros05 tests Cyril Hrubis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210823150520.25614-3-chrubis@suse.cz \
--to=chrubis@suse.cz \
--cc=ltp@lists.linux.it \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox