Skip to content

ztest: Add validation of zassert strings #96335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 2, 2025
Merged

ztest: Add validation of zassert strings #96335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
71d21f0
ztest: Add validation of zassert strings
tpambor Sep 21, 2025
a2b8c98
tests: zdsp: Correct format specifier in assert_strings
tpambor Sep 21, 2025
5184fd5
tests: ram_context_for_isr: fix format specifier for addresses
tpambor Sep 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions subsys/testsuite/ztest/include/zephyr/ztest_assert.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,9 @@ static inline bool z_zexpect_(bool cond, const char *file, int line)

#else /* CONFIG_ZTEST_ASSERT_VERBOSE != 0 */

static inline bool z_zassert(bool cond, const char *default_msg, const char *file, int line,
const char *func, const char *msg, ...)
static inline __printf_like(6, 7) bool z_zassert(bool cond, const char *default_msg,
const char *file, int line, const char *func,
const char *msg, ...)
{
if (cond == false) {
va_list vargs;
Expand All @@ -100,8 +101,9 @@ static inline bool z_zassert(bool cond, const char *default_msg, const char *fil
return true;
}

static inline bool z_zassume(bool cond, const char *default_msg, const char *file, int line,
const char *func, const char *msg, ...)
static inline __printf_like(6, 7) bool z_zassume(bool cond, const char *default_msg,
const char *file, int line, const char *func,
const char *msg, ...)
{
if (cond == false) {
va_list vargs;
Expand All @@ -124,8 +126,9 @@ static inline bool z_zassume(bool cond, const char *default_msg, const char *fil
return true;
}

static inline bool z_zexpect(bool cond, const char *default_msg, const char *file, int line,
const char *func, const char *msg, ...)
static inline __printf_like(6, 7) bool z_zexpect(bool cond, const char *default_msg,
const char *file, int line, const char *func,
const char *msg, ...)
{
if (cond == false) {
va_list vargs;
Expand Down
8 changes: 4 additions & 4 deletions tests/application_development/ram_context_for_isr/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,16 @@ static void test_irq_callback(const struct device *dev, void *user_data)
/* Check that the function and its call stack are in RAM */
zassert_true(func_addr >= CONFIG_SRAM_BASE_ADDRESS &&
func_addr <= CONFIG_SRAM_BASE_ADDRESS + CONFIG_SRAM_SIZE * 1024,
"%s is not in RAM! Address: 0x%x", __func__, func_addr);
"%s is not in RAM! Address: 0x%lx", __func__, func_addr);

zassert_true(driver_isr_addr >= CONFIG_SRAM_BASE_ADDRESS &&
driver_isr_addr <= CONFIG_SRAM_BASE_ADDRESS + CONFIG_SRAM_SIZE * 1024,
"fake_driver_isr is not in RAM! Address: 0x%x", driver_isr_addr);
"fake_driver_isr is not in RAM! Address: 0x%lx", driver_isr_addr);

zassert_true(arch_isr_wrapper_addr >= CONFIG_SRAM_BASE_ADDRESS &&
arch_isr_wrapper_addr <=
CONFIG_SRAM_BASE_ADDRESS + CONFIG_SRAM_SIZE * 1024,
"arch_isr_wrapper_addr is not in RAM! Address: 0x%x", arch_isr_wrapper_addr);
"arch_isr_wrapper_addr is not in RAM! Address: 0x%lx", arch_isr_wrapper_addr);

TC_PRINT("Callback function address: 0x%lx\n", func_addr);
TC_PRINT("Driver ISR address: 0x%lx\n", driver_isr_addr);
Expand All @@ -63,7 +63,7 @@ ZTEST(ram_context_for_isr, test_fake_driver_in_ram)

zassert_true(dev_addr >= CONFIG_SRAM_BASE_ADDRESS &&
dev_addr <= CONFIG_SRAM_BASE_ADDRESS + CONFIG_SRAM_SIZE * 1024,
"fake driver device is not in RAM! Address: 0x%x", dev_addr);
"fake driver device is not in RAM! Address: 0x%lx", dev_addr);

TC_PRINT("Fake driver device address: 0x%lx\n", dev_addr);

Expand Down
2 changes: 1 addition & 1 deletion tests/subsys/dsp/print_format/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#define float_multiplier(type) ((INT64_C(1) << (8 * sizeof(type) - 1)) - 1)

#define assert_strings(expected, actual) \
zexpect_equal(strlen(expected), strlen(actual), "Expected %d(%s), got %d(%s)", \
zexpect_equal(strlen(expected), strlen(actual), "Expected %zu(%s), got %zu(%s)", \
strlen(expected), expected, strlen(actual), actual); \
zexpect_mem_equal(expected, actual, MIN(strlen(expected), strlen(actual)), \
"Expected '%s', got '%s'", expected, actual)
Expand Down