From 57a893dc0d4b67072fc7c0fd13832dbc9324cb7e Mon Sep 17 00:00:00 2001 From: Krzysztof Chruscinski Date: Mon, 17 Jan 2022 10:55:17 +0100 Subject: [PATCH] testsuite: ztest: Use STRINGIFY in ZTEST_SUITE Using macro which will resolve complex SUITE_NAME. Without it wrong name was assigned when SUITE_NAME was consists of concatenated defines. Signed-off-by: Krzysztof Chruscinski --- subsys/testsuite/ztest/include/ztest_test_new.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/subsys/testsuite/ztest/include/ztest_test_new.h b/subsys/testsuite/ztest/include/ztest_test_new.h index 5f1fe7adc2e..c4c18b2c1bf 100644 --- a/subsys/testsuite/ztest/include/ztest_test_new.h +++ b/subsys/testsuite/ztest/include/ztest_test_new.h @@ -103,14 +103,14 @@ extern struct ztest_suite_node _ztest_suite_node_list_end[]; * @param after_fn The function to call after each unit test in this suite * @param teardown_fn The function to call after running all the tests in this suite */ -#define ZTEST_SUITE(SUITE_NAME, PREDICATE, setup_fn, before_fn, after_fn, teardown_fn) \ - static STRUCT_SECTION_ITERABLE(ztest_suite_node, z_ztest_test_node_##SUITE_NAME) = { \ - .name = #SUITE_NAME, \ - .setup = (setup_fn), \ - .before = (before_fn), \ - .after = (after_fn), \ - .teardown = (teardown_fn), \ - .predicate = PREDICATE, \ +#define ZTEST_SUITE(SUITE_NAME, PREDICATE, setup_fn, before_fn, after_fn, teardown_fn) \ + static STRUCT_SECTION_ITERABLE(ztest_suite_node, z_ztest_test_node_ ## SUITE_NAME) = { \ + .name = STRINGIFY(SUITE_NAME), \ + .setup = (setup_fn), \ + .before = (before_fn), \ + .after = (after_fn), \ + .teardown = (teardown_fn), \ + .predicate = PREDICATE, \ } /**