diff --git a/Kconfig.utestcases b/Kconfig.utestcases index e851ad39592..1d3810fb731 100644 --- a/Kconfig.utestcases +++ b/Kconfig.utestcases @@ -7,7 +7,7 @@ config RT_USING_UTESTCASES if RT_USING_UTESTCASES -rsource "examples/utest/testcases/utest/Kconfig" +rsource "components/utilities/utest/utest/Kconfig" rsource "examples/utest/testcases/kernel/Kconfig" rsource "examples/utest/testcases/cpp11/Kconfig" rsource "examples/utest/testcases/drivers/serial_v2/Kconfig" diff --git a/components/utilities/utest/SConscript b/components/utilities/utest/SConscript index 5d408ccbd09..47b8d9e3b89 100644 --- a/components/utilities/utest/SConscript +++ b/components/utilities/utest/SConscript @@ -5,4 +5,9 @@ src = Glob('*.c') CPPPATH = [cwd] group = DefineGroup('UTest', src, depend = ['RT_USING_UTEST'], CPPPATH = CPPPATH) +list = os.listdir(cwd) +for item in list: + if os.path.isfile(os.path.join(cwd, item, 'SConscript')): + group = group + SConscript(os.path.join(item, 'SConscript')) + Return('group') diff --git a/components/utilities/utest/utest/Kconfig b/components/utilities/utest/utest/Kconfig new file mode 100644 index 00000000000..088f49d1b6c --- /dev/null +++ b/components/utilities/utest/utest/Kconfig @@ -0,0 +1,8 @@ +menu "Utest Self Testcase" + +config UTEST_SELF_PASS_TC + bool "UTEST Self-test" + select RT_USING_UTEST + default n + +endmenu diff --git a/components/utilities/utest/utest/SConscript b/components/utilities/utest/utest/SConscript new file mode 100644 index 00000000000..64376185515 --- /dev/null +++ b/components/utilities/utest/utest/SConscript @@ -0,0 +1,10 @@ +from building import * + +src = [] + +if GetDepend('RT_UTEST_USING_ALL_CASES') or GetDepend('UTEST_SELF_PASS_TC'): + src += Glob('TC_*.c') + +group = DefineGroup('utc_UTest', src, depend = ['']) + +Return('group') diff --git a/components/utilities/utest/TC_uassert.c b/components/utilities/utest/utest/TC_uassert.c similarity index 90% rename from components/utilities/utest/TC_uassert.c rename to components/utilities/utest/utest/TC_uassert.c index bb212c14d1e..0599dff6ef8 100644 --- a/components/utilities/utest/TC_uassert.c +++ b/components/utilities/utest/utest/TC_uassert.c @@ -1,3 +1,9 @@ +/* + * Copyright (c) 2006-2025, RT-Thread Development Team + * + * SPDX-License-Identifier: Apache-2.0 + */ + #include #include "utest.h" @@ -80,4 +86,4 @@ static void utest_do_tc(void) UTEST_UNIT_RUN(TC_uassert_in_range); } -UTEST_TC_EXPORT(utest_do_tc, "utest.uassert", RT_NULL, RT_NULL, 10); +UTEST_TC_EXPORT(utest_do_tc, "utest", RT_NULL, RT_NULL, 10); diff --git a/examples/utest/testcases/utest/Kconfig b/examples/utest/testcases/utest/Kconfig deleted file mode 100644 index 85b4d796bd0..00000000000 --- a/examples/utest/testcases/utest/Kconfig +++ /dev/null @@ -1,7 +0,0 @@ -menu "Utest Self Testcase" - -config UTEST_SELF_PASS_TC - bool "Pass test" - default y - -endmenu diff --git a/examples/utest/testcases/utest/SConscript b/examples/utest/testcases/utest/SConscript deleted file mode 100644 index 1b35042e443..00000000000 --- a/examples/utest/testcases/utest/SConscript +++ /dev/null @@ -1,13 +0,0 @@ -Import('rtconfig') -from building import * - -cwd = GetCurrentDir() -src = Split(''' -pass_tc.c -''') - -CPPPATH = [cwd] - -group = DefineGroup('utestcases', src, depend = ['UTEST_SELF_PASS_TC'], CPPPATH = CPPPATH) - -Return('group') diff --git a/examples/utest/testcases/utest/pass_tc.c b/examples/utest/testcases/utest/pass_tc.c deleted file mode 100644 index c9ee912fbf1..00000000000 --- a/examples/utest/testcases/utest/pass_tc.c +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) 2006-2019, RT-Thread Development Team - * - * SPDX-License-Identifier: Apache-2.0 - * - * Change Logs: - * Date Author Notes - * 2019-01-16 MurphyZhao the first version - */ - -#include -#include "utest.h" - -static void test_assert_pass(void) -{ - uassert_true(1); - uassert_false(0); - - uassert_null(RT_NULL); - uassert_not_null(!RT_NULL); - - uassert_int_equal(1, 1); - uassert_int_not_equal(1, 2); - - uassert_str_equal("Hello RT-Thread!", "Hello RT-Thread!"); - uassert_str_not_equal("Hello RT-Thread!", "Hello"); - - uassert_in_range(2048, 1024, 4096); - uassert_not_in_range(0, 1024, 4096); -} - -static rt_err_t utest_tc_init(void) -{ - return RT_EOK; -} - -static rt_err_t utest_tc_cleanup(void) -{ - return RT_EOK; -} - -static void testcase(void) -{ - UTEST_UNIT_RUN(test_assert_pass); -} -UTEST_TC_EXPORT(testcase, "testcases.utest.pass_tc", utest_tc_init, utest_tc_cleanup, 10);