diff --git a/tests/kernel/common/CMakeLists.txt b/tests/kernel/common/CMakeLists.txt index bcfe5e158e7..a2b11e73d88 100644 --- a/tests/kernel/common/CMakeLists.txt +++ b/tests/kernel/common/CMakeLists.txt @@ -18,11 +18,8 @@ target_sources(app PRIVATE src/atomic.c src/byteorder.c src/clock.c - src/dlist.c src/intmath.c src/main.c - src/slist.c - src/sflist.c src/timeout_order.c src/multilib.c src/errno.c diff --git a/tests/kernel/common/src/main.c b/tests/kernel/common/src/main.c index b0c294e4994..aa66aa59db1 100644 --- a/tests/kernel/common/src/main.c +++ b/tests/kernel/common/src/main.c @@ -27,9 +27,6 @@ extern void test_sys_put_le64(void); extern void test_atomic(void); extern void test_intmath(void); extern void test_printk(void); -extern void test_slist(void); -extern void test_sflist(void); -extern void test_dlist(void); extern void test_timeout_order(void); extern void test_clock_cycle(void); extern void test_clock_uptime(void); @@ -122,9 +119,6 @@ void test_main(void) ztest_user_unit_test(test_atomic), ztest_unit_test(test_bitfield), ztest_unit_test(test_printk), - ztest_unit_test(test_slist), - ztest_unit_test(test_sflist), - ztest_unit_test(test_dlist), ztest_unit_test(test_intmath), ztest_unit_test(test_timeout_order), ztest_1cpu_user_unit_test(test_clock_uptime), diff --git a/tests/unit/list/CMakeLists.txt b/tests/unit/list/CMakeLists.txt new file mode 100644 index 00000000000..902723352c1 --- /dev/null +++ b/tests/unit/list/CMakeLists.txt @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: Apache-2.0 + +project(list) +set(SOURCES + main.c + slist.c + dlist.c + sflist.c + ) +include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) diff --git a/tests/kernel/common/src/dlist.c b/tests/unit/list/dlist.c similarity index 98% rename from tests/kernel/common/src/dlist.c rename to tests/unit/list/dlist.c index 639b90fe73a..9bec411c44f 100644 --- a/tests/kernel/common/src/dlist.c +++ b/tests/unit/list/dlist.c @@ -162,7 +162,7 @@ static inline bool verify_tail_head(sys_dlist_t *list, return true; } /** - * @addtogroup kernel_common_tests + * @addtogroup unit_tests * @{ */ @@ -177,7 +177,8 @@ void test_dlist(void) { sys_dlist_init(&test_list); - zassert_true((verify_emptyness(&test_list)), "test_list should be empty"); + zassert_true((verify_emptyness(&test_list)), + "test_list should be empty"); /* Appending node 1 */ sys_dlist_append(&test_list, &test_node_1.node); diff --git a/tests/unit/list/main.c b/tests/unit/list/main.c new file mode 100644 index 00000000000..6c4a4d906a4 --- /dev/null +++ b/tests/unit/list/main.c @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2017 Intel Corporation + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include + +extern void test_slist(void); +extern void test_sflist(void); +extern void test_dlist(void); + +void test_main(void) +{ + ztest_test_suite(dlist, + ztest_unit_test(test_dlist), + ztest_unit_test(test_slist), + ztest_unit_test(test_sflist) + ); + + ztest_run_test_suite(dlist); +} + diff --git a/tests/kernel/common/src/sflist.c b/tests/unit/list/sflist.c similarity index 99% rename from tests/kernel/common/src/sflist.c rename to tests/unit/list/sflist.c index 245704f2a47..8ac3b783d7a 100644 --- a/tests/kernel/common/src/sflist.c +++ b/tests/unit/list/sflist.c @@ -182,7 +182,8 @@ void test_sflist(void) { sys_sflist_init(&test_list); - zassert_true((verify_emptyness(&test_list)), "test_list should be empty"); + zassert_true((verify_emptyness(&test_list)), + "test_list should be empty"); /* Appending node 1 */ sys_sflist_append(&test_list, &test_node_1.node); diff --git a/tests/kernel/common/src/slist.c b/tests/unit/list/slist.c similarity index 99% rename from tests/kernel/common/src/slist.c rename to tests/unit/list/slist.c index 9e12895c7f3..2b30743775a 100644 --- a/tests/kernel/common/src/slist.c +++ b/tests/unit/list/slist.c @@ -182,7 +182,8 @@ void test_slist(void) { sys_slist_init(&test_list); - zassert_true((verify_emptyness(&test_list)), "test_list should be empty"); + zassert_true((verify_emptyness(&test_list)), + "test_list should be empty"); /* Appending node 1 */ sys_slist_append(&test_list, &test_node_1.node); diff --git a/tests/unit/list/testcase.yaml b/tests/unit/list/testcase.yaml new file mode 100644 index 00000000000..ec8943b21d1 --- /dev/null +++ b/tests/unit/list/testcase.yaml @@ -0,0 +1,4 @@ +tests: + utilities.lists: + tags: utils lists + type: unit