From 615a3cd68ae7c6f1deb26d777980594340f356bc Mon Sep 17 00:00:00 2001 From: Chen Wang Date: Fri, 26 Sep 2025 14:21:02 +0800 Subject: [PATCH] utest: move driver related case under to drivers src/utest/device_tc.c is testing API: rt_device_find(), which is a function defined in components/drivers/core/device.c. So it should be a testcase for drivers core, not for core. Move it to under components/drivers/core. Signed-off-by: Chen Wang --- Kconfig.utestcases | 1 + components/drivers/core/SConscript | 5 +++++ components/drivers/core/utest/Kconfig | 3 +++ components/drivers/core/utest/SConscript | 13 +++++++++++++ {src => components/drivers/core}/utest/device_tc.c | 2 +- src/utest/Kconfig | 4 ---- src/utest/SConscript | 3 --- 7 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 components/drivers/core/utest/Kconfig create mode 100644 components/drivers/core/utest/SConscript rename {src => components/drivers/core}/utest/device_tc.c (92%) diff --git a/Kconfig.utestcases b/Kconfig.utestcases index 133671268f8..4dd6ecdb3e0 100644 --- a/Kconfig.utestcases +++ b/Kconfig.utestcases @@ -21,6 +21,7 @@ rsource "examples/utest/testcases/perf/Kconfig" rsource "src/klibc/utest/Kconfig" +rsource "components/drivers/core/utest/Kconfig" rsource "components/drivers/audio/utest/Kconfig" rsource "components/dfs/utest/Kconfig" rsource "components/net/utest/Kconfig" diff --git a/components/drivers/core/SConscript b/components/drivers/core/SConscript index f3f3fbd313c..216f9a03483 100644 --- a/components/drivers/core/SConscript +++ b/components/drivers/core/SConscript @@ -18,4 +18,9 @@ if GetDepend(['RT_USING_OFW']): group = DefineGroup('DeviceDrivers', src, depend = ['RT_USING_DEVICE'], 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/core/utest/Kconfig b/components/drivers/core/utest/Kconfig new file mode 100644 index 00000000000..723a47ce395 --- /dev/null +++ b/components/drivers/core/utest/Kconfig @@ -0,0 +1,3 @@ +config RT_UTEST_DRIVERS_CORE + bool "Enable testcase for drivers core" + default n diff --git a/components/drivers/core/utest/SConscript b/components/drivers/core/utest/SConscript new file mode 100644 index 00000000000..722a7025f36 --- /dev/null +++ b/components/drivers/core/utest/SConscript @@ -0,0 +1,13 @@ +Import('rtconfig') +from building import * + +cwd = GetCurrentDir() +src = [] +CPPPATH = [cwd] + +if GetDepend('RT_UTEST_DRIVERS_CORE'): + src += Glob('*.c') + +group = DefineGroup('utestcases', src, depend = ['RT_USING_UTESTCASES'], CPPPATH = CPPPATH) + +Return('group') diff --git a/src/utest/device_tc.c b/components/drivers/core/utest/device_tc.c similarity index 92% rename from src/utest/device_tc.c rename to components/drivers/core/utest/device_tc.c index 132fbb6564d..510e49672ae 100644 --- a/src/utest/device_tc.c +++ b/components/drivers/core/utest/device_tc.c @@ -56,4 +56,4 @@ static void testcase(void) { UTEST_UNIT_RUN(test_rt_device_find); } -UTEST_TC_EXPORT(testcase, "core.device_find", utest_tc_init, utest_tc_cleanup, 5); +UTEST_TC_EXPORT(testcase, "components.drivers.core.device_find", utest_tc_init, utest_tc_cleanup, 5); diff --git a/src/utest/Kconfig b/src/utest/Kconfig index decb0d9f16e..85d6b853a94 100644 --- a/src/utest/Kconfig +++ b/src/utest/Kconfig @@ -62,10 +62,6 @@ config UTEST_THREAD_TC select RT_USING_TIMER_SOFT select RT_USING_THREAD -config UTEST_DEVICE_TC - bool "device test" - default n - config UTEST_ATOMIC_TC bool "atomic test" default n diff --git a/src/utest/SConscript b/src/utest/SConscript index 8a134ed4f8f..fae3eb8a6e3 100644 --- a/src/utest/SConscript +++ b/src/utest/SConscript @@ -46,9 +46,6 @@ if GetDepend(['UTEST_THREAD_TC']): src += ['thread_overflow_tc.c'] src += ['thread_suspend_tc.c'] -if GetDepend(['UTEST_DEVICE_TC']): - src += ['device_tc.c'] - if GetDepend(['UTEST_ATOMIC_TC']): src += ['atomic_tc.c']