From ff6c5559a70c41f6edbd3983995d58980da289eb Mon Sep 17 00:00:00 2001 From: Chen Wang Date: Sat, 11 Oct 2025 14:46:33 +0800 Subject: [PATCH] utest: smp_call: move from example to components/drivers/smp_call Also, - Rename UTEST_SMP_CALL_FUNC to RT_UTEST_SMP_CALL_FUNC. - Add depends on RT_USING_SMP in Kconfig for RT_UTEST_SMP_CALL_FUNC - Follow the naming rules of utest case to update the cases' name. Signed-off-by: Chen Wang --- Kconfig.utestcases | 3 +-- components/drivers/smp_call/SConscript | 5 +++++ components/drivers/smp_call/utest/Kconfig | 8 ++++++++ .../drivers/smp_call/utest}/SConscript | 2 +- .../drivers/smp_call/utest}/smp_001_tc.c | 2 +- .../drivers/smp_call/utest}/smp_002_tc.c | 2 +- .../drivers/smp_call/utest}/smp_003_tc.c | 2 +- .../drivers/smp_call/utest}/smp_004_tc.c | 2 +- examples/utest/testcases/smp_call/Kconfig | 6 ------ 9 files changed, 19 insertions(+), 13 deletions(-) create mode 100644 components/drivers/smp_call/utest/Kconfig rename {examples/utest/testcases/smp_call => components/drivers/smp_call/utest}/SConscript (81%) rename {examples/utest/testcases/smp_call => components/drivers/smp_call/utest}/smp_001_tc.c (94%) rename {examples/utest/testcases/smp_call => components/drivers/smp_call/utest}/smp_002_tc.c (96%) rename {examples/utest/testcases/smp_call => components/drivers/smp_call/utest}/smp_003_tc.c (96%) rename {examples/utest/testcases/smp_call => components/drivers/smp_call/utest}/smp_004_tc.c (97%) delete mode 100644 examples/utest/testcases/smp_call/Kconfig diff --git a/Kconfig.utestcases b/Kconfig.utestcases index 35f975ff707..2221228b4ba 100644 --- a/Kconfig.utestcases +++ b/Kconfig.utestcases @@ -14,7 +14,6 @@ rsource "examples/utest/testcases/drivers/ipc/Kconfig" rsource "examples/utest/testcases/posix/Kconfig" rsource "examples/utest/testcases/mm/Kconfig" rsource "examples/utest/testcases/tmpfs/Kconfig" -rsource "examples/utest/testcases/smp_call/Kconfig" rsource "examples/utest/testcases/perf/Kconfig" rsource "src/klibc/utest/Kconfig" @@ -22,7 +21,7 @@ rsource "src/klibc/utest/Kconfig" rsource "components/drivers/core/utest/Kconfig" rsource "components/drivers/audio/utest/Kconfig" rsource "components/drivers/serial/utest/Kconfig" - +rsource "components/drivers/smp_call/utest/Kconfig" rsource "components/dfs/utest/Kconfig" rsource "components/net/utest/Kconfig" diff --git a/components/drivers/smp_call/SConscript b/components/drivers/smp_call/SConscript index 1499c667e1d..504fe48eb48 100644 --- a/components/drivers/smp_call/SConscript +++ b/components/drivers/smp_call/SConscript @@ -7,4 +7,9 @@ if GetDepend("RT_USING_SMP"): CPPPATH = [cwd] group = DefineGroup('DeviceDrivers', src, depend = [''], 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/drivers/smp_call/utest/Kconfig b/components/drivers/smp_call/utest/Kconfig new file mode 100644 index 00000000000..db2f56e90f5 --- /dev/null +++ b/components/drivers/smp_call/utest/Kconfig @@ -0,0 +1,8 @@ +menu "SMP-Call Unit Testcases" + +config RT_UTEST_SMP_CALL_FUNC + bool "SMP-Call smoke test" + default n + depends on RT_USING_SMP + +endmenu diff --git a/examples/utest/testcases/smp_call/SConscript b/components/drivers/smp_call/utest/SConscript similarity index 81% rename from examples/utest/testcases/smp_call/SConscript rename to components/drivers/smp_call/utest/SConscript index 589638279f4..87c1d858401 100644 --- a/examples/utest/testcases/smp_call/SConscript +++ b/components/drivers/smp_call/utest/SConscript @@ -5,7 +5,7 @@ cwd = GetCurrentDir() src = [] CPPPATH = [cwd] -if GetDepend(['RT_USING_SMP', 'UTEST_SMP_CALL_FUNC']): +if GetDepend(['RT_UTEST_SMP_CALL_FUNC']): src += Glob('smp*.c') group = DefineGroup('utestcases', src, depend = ['RT_USING_UTESTCASES'], CPPPATH = CPPPATH) diff --git a/examples/utest/testcases/smp_call/smp_001_tc.c b/components/drivers/smp_call/utest/smp_001_tc.c similarity index 94% rename from examples/utest/testcases/smp_call/smp_001_tc.c rename to components/drivers/smp_call/utest/smp_001_tc.c index b75a5f68a9d..3f2f2da3f6c 100644 --- a/examples/utest/testcases/smp_call/smp_001_tc.c +++ b/components/drivers/smp_call/utest/smp_001_tc.c @@ -87,4 +87,4 @@ static void _testcase(void) UTEST_UNIT_RUN(_blocking_call); } -UTEST_TC_EXPORT(_testcase, "testcase.smp.smoke.001", utest_tc_init, utest_tc_cleanup, 10); +UTEST_TC_EXPORT(_testcase, "components.drivers.smp_call.smoke_001", utest_tc_init, utest_tc_cleanup, 10); diff --git a/examples/utest/testcases/smp_call/smp_002_tc.c b/components/drivers/smp_call/utest/smp_002_tc.c similarity index 96% rename from examples/utest/testcases/smp_call/smp_002_tc.c rename to components/drivers/smp_call/utest/smp_002_tc.c index 16e402ffe4e..be5e8ee0b0e 100644 --- a/examples/utest/testcases/smp_call/smp_002_tc.c +++ b/components/drivers/smp_call/utest/smp_002_tc.c @@ -129,4 +129,4 @@ static void _testcase(void) UTEST_UNIT_RUN(_blocking_mtsafe_call); } -UTEST_TC_EXPORT(_testcase, "testcase.smp.smoke.002", utest_tc_init, utest_tc_cleanup, 10); +UTEST_TC_EXPORT(_testcase, "components.drivers.smp_call.smoke_002", utest_tc_init, utest_tc_cleanup, 10); diff --git a/examples/utest/testcases/smp_call/smp_003_tc.c b/components/drivers/smp_call/utest/smp_003_tc.c similarity index 96% rename from examples/utest/testcases/smp_call/smp_003_tc.c rename to components/drivers/smp_call/utest/smp_003_tc.c index 4fe5b8c508d..fe5658f5c40 100644 --- a/examples/utest/testcases/smp_call/smp_003_tc.c +++ b/components/drivers/smp_call/utest/smp_003_tc.c @@ -125,4 +125,4 @@ static void _testcase(void) UTEST_UNIT_RUN(_async_call); } -UTEST_TC_EXPORT(_testcase, "testcase.smp.smoke.003", utest_tc_init, utest_tc_cleanup, 10); +UTEST_TC_EXPORT(_testcase, "components.drivers.smp_call.smoke_003", utest_tc_init, utest_tc_cleanup, 10); diff --git a/examples/utest/testcases/smp_call/smp_004_tc.c b/components/drivers/smp_call/utest/smp_004_tc.c similarity index 97% rename from examples/utest/testcases/smp_call/smp_004_tc.c rename to components/drivers/smp_call/utest/smp_004_tc.c index 4fc22fbc6d0..32323f21342 100644 --- a/examples/utest/testcases/smp_call/smp_004_tc.c +++ b/components/drivers/smp_call/utest/smp_004_tc.c @@ -207,4 +207,4 @@ static void _testcase(void) UTEST_UNIT_RUN(_test_reentr_isr_main); } -UTEST_TC_EXPORT(_testcase, "testcase.smp.smoke.004", utest_tc_init, utest_tc_cleanup, 10); +UTEST_TC_EXPORT(_testcase, "components.drivers.smp_call.smoke_004", utest_tc_init, utest_tc_cleanup, 10); diff --git a/examples/utest/testcases/smp_call/Kconfig b/examples/utest/testcases/smp_call/Kconfig deleted file mode 100644 index 785fa5fff37..00000000000 --- a/examples/utest/testcases/smp_call/Kconfig +++ /dev/null @@ -1,6 +0,0 @@ -menu "SMP-Call Testcase" - -config UTEST_SMP_CALL_FUNC - bool "SMP-Call test cases" - default n -endmenu