diff mbox series

tst_test_macros.h: Make TST_EXP_POSSITIVE() print TPASS as well

Message ID 20210811092149.11287-1-chrubis@suse.cz
State Accepted
Headers show
Series tst_test_macros.h: Make TST_EXP_POSSITIVE() print TPASS as well | expand

Commit Message

Cyril Hrubis Aug. 11, 2021, 9:21 a.m. UTC 
So that it could be used in the tests.

Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
CC: sujiaxun <sujiaxun@uniontech.com>
---
 include/tst_test_macros.h | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

Comments

Petr Vorel Aug. 20, 2021, 9:45 a.m. UTC | #1 
Hi Cyril,

good idea.
nit: TST_EXP_POSSITIVE => TST_EXP_POSITIVE in commit message subject.

Reviewed-by: Petr Vorel <pvorel@suse.cz>

Kind regards,
Petr
Cyril Hrubis Aug. 20, 2021, 1:54 p.m. UTC | #2 
Hi!
Thanks for the review, pushed.
diff mbox series

Patch

diff --git a/include/tst_test_macros.h b/include/tst_test_macros.h
index cd65d8d0d..d9d7f930f 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, ...)                                          \
 	do {                                                                   \
 		TEST(SCALL);                                                   \
 		                                                               \
@@ -68,7 +68,17 @@  extern void *TST_RET_PTR;
                                                                                \
 	} while (0)
 
-#define TST_EXP_FD_SILENT(SCALL, ...)	TST_EXP_POSITIVE(SCALL, __VA_ARGS__)
+#define TST_EXP_POSITIVE(SCALL, ...)                               \
+	do {                                                       \
+		TST_EXP_POSITIVE_(SCALL, __VA_ARGS__);             \
+		                                                   \
+		if (TST_PASS) {                                    \
+			TST_MSGP_(TPASS, " returned %ld",          \
+			          TST_RET, #SCALL, ##__VA_ARGS__); \
+		}                                                  \
+	} while (0)
+
+#define TST_EXP_FD_SILENT(SCALL, ...)	TST_EXP_POSITIVE_(SCALL, __VA_ARGS__)
 
 #define TST_EXP_FD(SCALL, ...)                                                 \
 	do {                                                                   \
@@ -79,7 +89,7 @@  extern void *TST_RET_PTR;
 				#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 {                                                                   \