michaelh/zephyr
1
0
Fork 0
Code Releases Activity

ztest: prepare zassert and zassume macro to be used without message

Browse source 
This commit adds intermediate macros that will allow to use the
zassert and zassume macros without setting the msg parameter as NULL
if it isn't used.

Signed-off-by: Michał Barnaś <mb@semihalf.com>
This commit is contained in:
Michał Barnaś 2022-08-17 15:54:31 +02:00 • committed by Anas Nashif
commit 305ee1816a
1 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
subsys/testsuite/ztest/include/zephyr/ztest_assert.h
View file

@ -130,7 +130,7 @@ static inline bool z_zassume(bool cond, const char *default_msg, const char *fil
* @param default_msg Message to print if @a cond is false
* @param msg Optional, can be NULL. Message to print if @a cond is false.
*/
#define zassert(cond, default_msg, msg, ...) \
#define _zassert_base(cond, default_msg, msg, ...) \
do { \
bool _msg = (msg != NULL); \
bool _ret = z_zassert(cond, _msg ? ("(" default_msg ")") : (default_msg), __FILE__,\
@ -143,6 +143,12 @@ static inline bool z_zassume(bool cond, const char *default_msg, const char *fil
} \
} while (0)
#define _zassert_va(cond, default_msg, msg, ...) \
_zassert_base(cond, default_msg, msg, ##__VA_ARGS__)
#define zassert(cond, default_msg, ...) \
_zassert_va(cond, default_msg, COND_CODE_1(__VA_OPT__(1), (__VA_ARGS__), (NULL)))
/**
* @brief Skip the test, if @a cond is false
*
@ -161,7 +167,7 @@ static inline bool z_zassume(bool cond, const char *default_msg, const char *fil
* @param default_msg Message to print if @a cond is false
* @param msg Optional, can be NULL. Message to print if @a cond is false.
*/
#define zassume(cond, default_msg, msg, ...) \
#define _zassume_base(cond, default_msg, msg, ...) \
do { \
bool _msg = (msg != NULL); \
bool _ret = z_zassume(cond, _msg ? ("(" default_msg ")") : (default_msg), __FILE__,\
@ -173,6 +179,13 @@ static inline bool z_zassume(bool cond, const char *default_msg, const char *fil
()) \
} \
} while (0)
#define _zassume_va(cond, default_msg, msg, ...) \
_zassume_base(cond, default_msg, msg, ##__VA_ARGS__)
#define zassume(cond, default_msg, ...) \
_zassume_va(cond, default_msg, COND_CODE_1(__VA_OPT__(1), (__VA_ARGS__), (NULL)))
/**
* @brief Assert that this function call won't be reached
* @param msg Optional message to print if the assertion fails