michaelh/zephyr
1
0
Fork 0
Code Releases Activity

ztest: Fix incorrect use of this as fixture

Browse source 
Update `this` to `fixture` to avoid C++ keyword error.

Fixes #46459

Signed-off-by: Yuval Peress <peress@google.com>
This commit is contained in:
Yuval Peress 2022-06-16 11:37:22 -06:00 • committed by Anas Nashif
commit d813e9b39f
6 changed files with 55 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
subsys/testsuite/ztest/include/ztest_test_new.h
View file

@ -220,7 +220,7 @@ static inline void unit_test_noop(void)
#define Z_TEST(suite, fn, t_options, use_fixture) \
static void _##suite##_##fn##_wrapper(void *data); \
static void suite##_##fn( \
COND_CODE_1(use_fixture, (struct suite##_fixture *this), (void))); \
COND_CODE_1(use_fixture, (struct suite##_fixture *fixture), (void))); \
static STRUCT_SECTION_ITERABLE(ztest_unit_test, z_ztest_unit_test_##suite##_##fn) = { \
.test_suite_name = STRINGIFY(suite), \
.name = STRINGIFY(fn), \
@ -233,7 +233,7 @@ static inline void unit_test_noop(void)
(ARG_UNUSED(data); suite##_##fn();)) \
} \
static inline void suite##_##fn( \
COND_CODE_1(use_fixture, (struct suite##_fixture *this), (void)))
COND_CODE_1(use_fixture, (struct suite##_fixture *fixture), (void)))
#define Z_ZTEST(suite, fn, t_options) Z_TEST(suite, fn, t_options, 0)
#define Z_ZTEST_F(suite, fn, t_options) Z_TEST(suite, fn, t_options, 1)