From b1b3892180356a60ad3bb65797600db559da0d25 Mon Sep 17 00:00:00 2001 From: Chen Wang Date: Mon, 13 Oct 2025 08:47:37 +0800 Subject: [PATCH] utest: ipc: move from examples to components/drivers/ipc Also: - Add "RT_" prefix for utest config options. - Rename the case names to following the naming rule. Signed-off-by: Chen Wang --- Kconfig.utestcases | 2 +- components/drivers/ipc/SConscript | 5 +++++ components/drivers/ipc/utest/Kconfig | 12 ++++++++++++ .../drivers/ipc/utest}/SConscript | 4 ++-- .../drivers/ipc/utest}/completion_tc.c | 2 +- .../drivers/ipc/utest}/completion_timeout_tc.c | 2 +- .../drivers/ipc/utest}/workqueue_tc.c | 0 examples/utest/testcases/drivers/SConscript | 15 --------------- examples/utest/testcases/drivers/ipc/Kconfig | 11 ----------- 9 files changed, 22 insertions(+), 31 deletions(-) create mode 100644 components/drivers/ipc/utest/Kconfig rename {examples/utest/testcases/drivers/ipc => components/drivers/ipc/utest}/SConscript (79%) rename {examples/utest/testcases/drivers/ipc => components/drivers/ipc/utest}/completion_tc.c (98%) rename {examples/utest/testcases/drivers/ipc => components/drivers/ipc/utest}/completion_timeout_tc.c (98%) rename {examples/utest/testcases/drivers/ipc => components/drivers/ipc/utest}/workqueue_tc.c (100%) delete mode 100644 examples/utest/testcases/drivers/SConscript delete mode 100644 examples/utest/testcases/drivers/ipc/Kconfig diff --git a/Kconfig.utestcases b/Kconfig.utestcases index 29980bed844..f89ac66aa30 100644 --- a/Kconfig.utestcases +++ b/Kconfig.utestcases @@ -10,7 +10,6 @@ if RT_USING_UTESTCASES rsource "components/utilities/utest/utest/Kconfig" rsource "src/utest/Kconfig" rsource "examples/utest/testcases/cpp11/Kconfig" -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" @@ -19,6 +18,7 @@ rsource "src/klibc/utest/Kconfig" rsource "components/drivers/core/utest/Kconfig" rsource "components/drivers/audio/utest/Kconfig" +rsource "components/drivers/ipc/utest/Kconfig" rsource "components/drivers/serial/utest/Kconfig" rsource "components/drivers/smp_call/utest/Kconfig" rsource "components/dfs/utest/Kconfig" diff --git a/components/drivers/ipc/SConscript b/components/drivers/ipc/SConscript index d8a18939f3a..892701733c5 100644 --- a/components/drivers/ipc/SConscript +++ b/components/drivers/ipc/SConscript @@ -15,4 +15,9 @@ else: group = DefineGroup('DeviceDrivers', src, depend = ['RT_USING_DEVICE_IPC'], CPPPATH = CPPPATH, LOCAL_CPPDEFINES=['__RT_IPC_SOURCE__']) +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/ipc/utest/Kconfig b/components/drivers/ipc/utest/Kconfig new file mode 100644 index 00000000000..86c4c5dc7fd --- /dev/null +++ b/components/drivers/ipc/utest/Kconfig @@ -0,0 +1,12 @@ +menu "IPC Unit Testcases" + depends on RT_USING_DEVICE_IPC + +config RT_UTEST_COMPLETION + bool "rt_completion testcase" + default n + +config RT_UTEST_WORKQUEUE + bool "rt_workqueue testcase" + default n + +endmenu diff --git a/examples/utest/testcases/drivers/ipc/SConscript b/components/drivers/ipc/utest/SConscript similarity index 79% rename from examples/utest/testcases/drivers/ipc/SConscript rename to components/drivers/ipc/utest/SConscript index b6c60779b7c..12a67b6fd60 100644 --- a/examples/utest/testcases/drivers/ipc/SConscript +++ b/components/drivers/ipc/utest/SConscript @@ -5,10 +5,10 @@ cwd = GetCurrentDir() src = [] CPPPATH = [cwd] -if GetDepend(['UTEST_COMPLETION_TC']): +if GetDepend(['RT_UTEST_COMPLETION']): src += ['completion_tc.c', 'completion_timeout_tc.c'] -if GetDepend(['UTEST_WORKQUEUE_TC']): +if GetDepend(['RT_UTEST_WORKQUEUE']): src += ['workqueue_tc.c'] group = DefineGroup('utestcases', src, depend = ['RT_USING_UTESTCASES'], CPPPATH = CPPPATH) diff --git a/examples/utest/testcases/drivers/ipc/completion_tc.c b/components/drivers/ipc/utest/completion_tc.c similarity index 98% rename from examples/utest/testcases/drivers/ipc/completion_tc.c rename to components/drivers/ipc/utest/completion_tc.c index fa7958963bb..4406153bdc9 100644 --- a/examples/utest/testcases/drivers/ipc/completion_tc.c +++ b/components/drivers/ipc/utest/completion_tc.c @@ -195,5 +195,5 @@ static rt_err_t utest_tc_cleanup(void) return RT_EOK; } -UTEST_TC_EXPORT(testcase, "testcases.drivers.ipc.rt_completion.basic", +UTEST_TC_EXPORT(testcase, "components.drivers.ipc.rt_completion_basic", utest_tc_init, utest_tc_cleanup, 10); diff --git a/examples/utest/testcases/drivers/ipc/completion_timeout_tc.c b/components/drivers/ipc/utest/completion_timeout_tc.c similarity index 98% rename from examples/utest/testcases/drivers/ipc/completion_timeout_tc.c rename to components/drivers/ipc/utest/completion_timeout_tc.c index abceeea17d9..b7f10959e05 100644 --- a/examples/utest/testcases/drivers/ipc/completion_timeout_tc.c +++ b/components/drivers/ipc/utest/completion_timeout_tc.c @@ -209,5 +209,5 @@ static rt_err_t utest_tc_cleanup(void) return RT_EOK; } -UTEST_TC_EXPORT(testcase, "testcases.drivers.ipc.rt_completion.timeout", +UTEST_TC_EXPORT(testcase, "components.drivers.ipc.rt_completion_timeout", utest_tc_init, utest_tc_cleanup, 1000); diff --git a/examples/utest/testcases/drivers/ipc/workqueue_tc.c b/components/drivers/ipc/utest/workqueue_tc.c similarity index 100% rename from examples/utest/testcases/drivers/ipc/workqueue_tc.c rename to components/drivers/ipc/utest/workqueue_tc.c diff --git a/examples/utest/testcases/drivers/SConscript b/examples/utest/testcases/drivers/SConscript deleted file mode 100644 index 4c815c49b83..00000000000 --- a/examples/utest/testcases/drivers/SConscript +++ /dev/null @@ -1,15 +0,0 @@ -# RT-Thread building script for bridge - -import os -from building import * - -cwd = GetCurrentDir() -objs = [] -list = os.listdir(cwd) - -for d in list: - path = os.path.join(cwd, d) - if os.path.isfile(os.path.join(path, 'SConscript')): - objs = objs + SConscript(os.path.join(d, 'SConscript')) - -Return('objs') diff --git a/examples/utest/testcases/drivers/ipc/Kconfig b/examples/utest/testcases/drivers/ipc/Kconfig deleted file mode 100644 index 7131a8184f4..00000000000 --- a/examples/utest/testcases/drivers/ipc/Kconfig +++ /dev/null @@ -1,11 +0,0 @@ -menu "Utest IPC Testcase" - -config UTEST_COMPLETION_TC - bool "rt_completion testcase" - default n - -config UTEST_WORKQUEUE_TC - bool "rt_workqueue testcase" - default n - -endmenu