From 3b97667323716a75823bfabf7c59ae7bf64f01cc Mon Sep 17 00:00:00 2001 From: Chen Wang Date: Fri, 10 Oct 2025 14:56:32 +0800 Subject: [PATCH] utest: serial: move from examples to components/drivers/serial Signed-off-by: Chen Wang --- Kconfig.utestcases | 4 ++-- components/drivers/serial/SConscript | 5 +++++ .../drivers/serial/utest}/Kconfig | 15 ++++++++++----- components/drivers/serial/utest/SConscript | 15 +++++++++++++++ .../drivers/serial/utest/bypass}/SConscript | 0 .../serial/utest/bypass}/bypass_conflict.c | 0 .../serial/utest/bypass}/bypass_lower_run.c | 0 .../serial/utest/bypass}/bypass_register.c | 0 .../serial/utest/bypass}/bypass_upper_run.c | 0 .../drivers/serial/utest/v2}/README.md | 0 .../drivers/serial/utest/v2}/SConscript | 0 .../utest/v2}/posix/uart_posix_echo_block.c | 0 .../serial/utest/v2}/posix/uart_posix_nonblock.c | 0 .../serial/utest/v2}/qemu/uart_qemu_echo.c | 0 .../drivers/serial/utest/v2}/uart_blocking_rx.c | 0 .../drivers/serial/utest/v2}/uart_blocking_tx.c | 0 .../drivers/serial/utest/v2}/uart_flush_rx.c | 0 .../drivers/serial/utest/v2}/uart_flush_txb.c | 0 .../drivers/serial/utest/v2}/uart_flush_txnb.c | 0 .../utest/v2}/uart_get_unread_bytes_count.c | 0 .../serial/utest/v2}/uart_nonblocking_rx.c | 0 .../serial/utest/v2}/uart_nonblocking_tx.c | 0 .../serial/utest/v2}/uart_overflow_rxb_txb.c | 0 .../drivers/serial/utest/v2}/uart_rxb_txb.c | 0 .../drivers/serial/utest/v2}/uart_rxb_txnb.c | 0 .../drivers/serial/utest/v2}/uart_rxnb_txb.c | 0 .../drivers/serial/utest/v2}/uart_rxnb_txnb.c | 0 .../drivers/serial/utest/v2}/uart_timeout_rxb.c | 0 .../serial/utest/v2}/uart_timeout_rxb_txb.c | 0 .../drivers/serial/utest/v2}/uart_timeout_txb.c | 0 .../utest/testcases/drivers/serial_bypass/Kconfig | 8 -------- 31 files changed, 32 insertions(+), 15 deletions(-) rename {examples/utest/testcases/drivers/serial_v2 => components/drivers/serial/utest}/Kconfig (79%) create mode 100644 components/drivers/serial/utest/SConscript rename {examples/utest/testcases/drivers/serial_bypass => components/drivers/serial/utest/bypass}/SConscript (100%) rename {examples/utest/testcases/drivers/serial_bypass => components/drivers/serial/utest/bypass}/bypass_conflict.c (100%) rename {examples/utest/testcases/drivers/serial_bypass => components/drivers/serial/utest/bypass}/bypass_lower_run.c (100%) rename {examples/utest/testcases/drivers/serial_bypass => components/drivers/serial/utest/bypass}/bypass_register.c (100%) rename {examples/utest/testcases/drivers/serial_bypass => components/drivers/serial/utest/bypass}/bypass_upper_run.c (100%) rename {examples/utest/testcases/drivers/serial_v2 => components/drivers/serial/utest/v2}/README.md (100%) rename {examples/utest/testcases/drivers/serial_v2 => components/drivers/serial/utest/v2}/SConscript (100%) rename {examples/utest/testcases/drivers/serial_v2 => components/drivers/serial/utest/v2}/posix/uart_posix_echo_block.c (100%) rename {examples/utest/testcases/drivers/serial_v2 => components/drivers/serial/utest/v2}/posix/uart_posix_nonblock.c (100%) rename {examples/utest/testcases/drivers/serial_v2 => components/drivers/serial/utest/v2}/qemu/uart_qemu_echo.c (100%) rename {examples/utest/testcases/drivers/serial_v2 => components/drivers/serial/utest/v2}/uart_blocking_rx.c (100%) rename {examples/utest/testcases/drivers/serial_v2 => components/drivers/serial/utest/v2}/uart_blocking_tx.c (100%) rename {examples/utest/testcases/drivers/serial_v2 => components/drivers/serial/utest/v2}/uart_flush_rx.c (100%) rename {examples/utest/testcases/drivers/serial_v2 => components/drivers/serial/utest/v2}/uart_flush_txb.c (100%) rename {examples/utest/testcases/drivers/serial_v2 => components/drivers/serial/utest/v2}/uart_flush_txnb.c (100%) rename {examples/utest/testcases/drivers/serial_v2 => components/drivers/serial/utest/v2}/uart_get_unread_bytes_count.c (100%) rename {examples/utest/testcases/drivers/serial_v2 => components/drivers/serial/utest/v2}/uart_nonblocking_rx.c (100%) rename {examples/utest/testcases/drivers/serial_v2 => components/drivers/serial/utest/v2}/uart_nonblocking_tx.c (100%) rename {examples/utest/testcases/drivers/serial_v2 => components/drivers/serial/utest/v2}/uart_overflow_rxb_txb.c (100%) rename {examples/utest/testcases/drivers/serial_v2 => components/drivers/serial/utest/v2}/uart_rxb_txb.c (100%) rename {examples/utest/testcases/drivers/serial_v2 => components/drivers/serial/utest/v2}/uart_rxb_txnb.c (100%) rename {examples/utest/testcases/drivers/serial_v2 => components/drivers/serial/utest/v2}/uart_rxnb_txb.c (100%) rename {examples/utest/testcases/drivers/serial_v2 => components/drivers/serial/utest/v2}/uart_rxnb_txnb.c (100%) rename {examples/utest/testcases/drivers/serial_v2 => components/drivers/serial/utest/v2}/uart_timeout_rxb.c (100%) rename {examples/utest/testcases/drivers/serial_v2 => components/drivers/serial/utest/v2}/uart_timeout_rxb_txb.c (100%) rename {examples/utest/testcases/drivers/serial_v2 => components/drivers/serial/utest/v2}/uart_timeout_txb.c (100%) delete mode 100644 examples/utest/testcases/drivers/serial_bypass/Kconfig diff --git a/Kconfig.utestcases b/Kconfig.utestcases index 4dd6ecdb3e..35f975ff70 100644 --- a/Kconfig.utestcases +++ b/Kconfig.utestcases @@ -10,8 +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/serial_v2/Kconfig" -rsource "examples/utest/testcases/drivers/serial_bypass/Kconfig" rsource "examples/utest/testcases/drivers/ipc/Kconfig" rsource "examples/utest/testcases/posix/Kconfig" rsource "examples/utest/testcases/mm/Kconfig" @@ -23,6 +21,8 @@ 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/dfs/utest/Kconfig" rsource "components/net/utest/Kconfig" diff --git a/components/drivers/serial/SConscript b/components/drivers/serial/SConscript index 04fa37ed44..d0b5fb0635 100644 --- a/components/drivers/serial/SConscript +++ b/components/drivers/serial/SConscript @@ -24,4 +24,9 @@ if GetDepend(['RT_USING_DM']): 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/examples/utest/testcases/drivers/serial_v2/Kconfig b/components/drivers/serial/utest/Kconfig similarity index 79% rename from examples/utest/testcases/drivers/serial_v2/Kconfig rename to components/drivers/serial/utest/Kconfig index ef451d21d2..cc6413374f 100644 --- a/examples/utest/testcases/drivers/serial_v2/Kconfig +++ b/components/drivers/serial/utest/Kconfig @@ -1,7 +1,12 @@ -menu "Utest Serial Testcase" +menu "Serial Unit Testcases" + + config UTEST_SERIAL_BYPASS + bool "Serial Bypass testcases" + default n + depends on RT_USING_SERIAL_BYPASS config UTEST_SERIAL_TC - bool "Serial testcase" + bool "Serial V2 testcases" default n depends on RT_USING_SERIAL_V2 @@ -37,8 +42,8 @@ menu "Utest Serial Testcase" if UTEST_SERIAL_POSIX_TC config RT_SERIAL_POSIX_TC_DEVICE_NAME - string "the device name for serial posix test" - default "dev/uart2" + string "the device name for serial posix test" + default "dev/uart2" config RT_SERIAL_POSIX_TC_SEND_ITERATIONS int "the number of iterations for the posix test routine." @@ -48,4 +53,4 @@ menu "Utest Serial Testcase" endif -endmenu +endmenu \ No newline at end of file diff --git a/components/drivers/serial/utest/SConscript b/components/drivers/serial/utest/SConscript new file mode 100644 index 0000000000..e98495c213 --- /dev/null +++ b/components/drivers/serial/utest/SConscript @@ -0,0 +1,15 @@ +Import('rtconfig') +from building import * + +cwd = GetCurrentDir() +src = [] +CPPPATH = [cwd] + +group = DefineGroup('utestcases', src, depend = ['RT_USING_UTESTCASES', 'RT_USING_SERIAL'], 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/examples/utest/testcases/drivers/serial_bypass/SConscript b/components/drivers/serial/utest/bypass/SConscript similarity index 100% rename from examples/utest/testcases/drivers/serial_bypass/SConscript rename to components/drivers/serial/utest/bypass/SConscript diff --git a/examples/utest/testcases/drivers/serial_bypass/bypass_conflict.c b/components/drivers/serial/utest/bypass/bypass_conflict.c similarity index 100% rename from examples/utest/testcases/drivers/serial_bypass/bypass_conflict.c rename to components/drivers/serial/utest/bypass/bypass_conflict.c diff --git a/examples/utest/testcases/drivers/serial_bypass/bypass_lower_run.c b/components/drivers/serial/utest/bypass/bypass_lower_run.c similarity index 100% rename from examples/utest/testcases/drivers/serial_bypass/bypass_lower_run.c rename to components/drivers/serial/utest/bypass/bypass_lower_run.c diff --git a/examples/utest/testcases/drivers/serial_bypass/bypass_register.c b/components/drivers/serial/utest/bypass/bypass_register.c similarity index 100% rename from examples/utest/testcases/drivers/serial_bypass/bypass_register.c rename to components/drivers/serial/utest/bypass/bypass_register.c diff --git a/examples/utest/testcases/drivers/serial_bypass/bypass_upper_run.c b/components/drivers/serial/utest/bypass/bypass_upper_run.c similarity index 100% rename from examples/utest/testcases/drivers/serial_bypass/bypass_upper_run.c rename to components/drivers/serial/utest/bypass/bypass_upper_run.c diff --git a/examples/utest/testcases/drivers/serial_v2/README.md b/components/drivers/serial/utest/v2/README.md similarity index 100% rename from examples/utest/testcases/drivers/serial_v2/README.md rename to components/drivers/serial/utest/v2/README.md diff --git a/examples/utest/testcases/drivers/serial_v2/SConscript b/components/drivers/serial/utest/v2/SConscript similarity index 100% rename from examples/utest/testcases/drivers/serial_v2/SConscript rename to components/drivers/serial/utest/v2/SConscript diff --git a/examples/utest/testcases/drivers/serial_v2/posix/uart_posix_echo_block.c b/components/drivers/serial/utest/v2/posix/uart_posix_echo_block.c similarity index 100% rename from examples/utest/testcases/drivers/serial_v2/posix/uart_posix_echo_block.c rename to components/drivers/serial/utest/v2/posix/uart_posix_echo_block.c diff --git a/examples/utest/testcases/drivers/serial_v2/posix/uart_posix_nonblock.c b/components/drivers/serial/utest/v2/posix/uart_posix_nonblock.c similarity index 100% rename from examples/utest/testcases/drivers/serial_v2/posix/uart_posix_nonblock.c rename to components/drivers/serial/utest/v2/posix/uart_posix_nonblock.c diff --git a/examples/utest/testcases/drivers/serial_v2/qemu/uart_qemu_echo.c b/components/drivers/serial/utest/v2/qemu/uart_qemu_echo.c similarity index 100% rename from examples/utest/testcases/drivers/serial_v2/qemu/uart_qemu_echo.c rename to components/drivers/serial/utest/v2/qemu/uart_qemu_echo.c diff --git a/examples/utest/testcases/drivers/serial_v2/uart_blocking_rx.c b/components/drivers/serial/utest/v2/uart_blocking_rx.c similarity index 100% rename from examples/utest/testcases/drivers/serial_v2/uart_blocking_rx.c rename to components/drivers/serial/utest/v2/uart_blocking_rx.c diff --git a/examples/utest/testcases/drivers/serial_v2/uart_blocking_tx.c b/components/drivers/serial/utest/v2/uart_blocking_tx.c similarity index 100% rename from examples/utest/testcases/drivers/serial_v2/uart_blocking_tx.c rename to components/drivers/serial/utest/v2/uart_blocking_tx.c diff --git a/examples/utest/testcases/drivers/serial_v2/uart_flush_rx.c b/components/drivers/serial/utest/v2/uart_flush_rx.c similarity index 100% rename from examples/utest/testcases/drivers/serial_v2/uart_flush_rx.c rename to components/drivers/serial/utest/v2/uart_flush_rx.c diff --git a/examples/utest/testcases/drivers/serial_v2/uart_flush_txb.c b/components/drivers/serial/utest/v2/uart_flush_txb.c similarity index 100% rename from examples/utest/testcases/drivers/serial_v2/uart_flush_txb.c rename to components/drivers/serial/utest/v2/uart_flush_txb.c diff --git a/examples/utest/testcases/drivers/serial_v2/uart_flush_txnb.c b/components/drivers/serial/utest/v2/uart_flush_txnb.c similarity index 100% rename from examples/utest/testcases/drivers/serial_v2/uart_flush_txnb.c rename to components/drivers/serial/utest/v2/uart_flush_txnb.c diff --git a/examples/utest/testcases/drivers/serial_v2/uart_get_unread_bytes_count.c b/components/drivers/serial/utest/v2/uart_get_unread_bytes_count.c similarity index 100% rename from examples/utest/testcases/drivers/serial_v2/uart_get_unread_bytes_count.c rename to components/drivers/serial/utest/v2/uart_get_unread_bytes_count.c diff --git a/examples/utest/testcases/drivers/serial_v2/uart_nonblocking_rx.c b/components/drivers/serial/utest/v2/uart_nonblocking_rx.c similarity index 100% rename from examples/utest/testcases/drivers/serial_v2/uart_nonblocking_rx.c rename to components/drivers/serial/utest/v2/uart_nonblocking_rx.c diff --git a/examples/utest/testcases/drivers/serial_v2/uart_nonblocking_tx.c b/components/drivers/serial/utest/v2/uart_nonblocking_tx.c similarity index 100% rename from examples/utest/testcases/drivers/serial_v2/uart_nonblocking_tx.c rename to components/drivers/serial/utest/v2/uart_nonblocking_tx.c diff --git a/examples/utest/testcases/drivers/serial_v2/uart_overflow_rxb_txb.c b/components/drivers/serial/utest/v2/uart_overflow_rxb_txb.c similarity index 100% rename from examples/utest/testcases/drivers/serial_v2/uart_overflow_rxb_txb.c rename to components/drivers/serial/utest/v2/uart_overflow_rxb_txb.c diff --git a/examples/utest/testcases/drivers/serial_v2/uart_rxb_txb.c b/components/drivers/serial/utest/v2/uart_rxb_txb.c similarity index 100% rename from examples/utest/testcases/drivers/serial_v2/uart_rxb_txb.c rename to components/drivers/serial/utest/v2/uart_rxb_txb.c diff --git a/examples/utest/testcases/drivers/serial_v2/uart_rxb_txnb.c b/components/drivers/serial/utest/v2/uart_rxb_txnb.c similarity index 100% rename from examples/utest/testcases/drivers/serial_v2/uart_rxb_txnb.c rename to components/drivers/serial/utest/v2/uart_rxb_txnb.c diff --git a/examples/utest/testcases/drivers/serial_v2/uart_rxnb_txb.c b/components/drivers/serial/utest/v2/uart_rxnb_txb.c similarity index 100% rename from examples/utest/testcases/drivers/serial_v2/uart_rxnb_txb.c rename to components/drivers/serial/utest/v2/uart_rxnb_txb.c diff --git a/examples/utest/testcases/drivers/serial_v2/uart_rxnb_txnb.c b/components/drivers/serial/utest/v2/uart_rxnb_txnb.c similarity index 100% rename from examples/utest/testcases/drivers/serial_v2/uart_rxnb_txnb.c rename to components/drivers/serial/utest/v2/uart_rxnb_txnb.c diff --git a/examples/utest/testcases/drivers/serial_v2/uart_timeout_rxb.c b/components/drivers/serial/utest/v2/uart_timeout_rxb.c similarity index 100% rename from examples/utest/testcases/drivers/serial_v2/uart_timeout_rxb.c rename to components/drivers/serial/utest/v2/uart_timeout_rxb.c diff --git a/examples/utest/testcases/drivers/serial_v2/uart_timeout_rxb_txb.c b/components/drivers/serial/utest/v2/uart_timeout_rxb_txb.c similarity index 100% rename from examples/utest/testcases/drivers/serial_v2/uart_timeout_rxb_txb.c rename to components/drivers/serial/utest/v2/uart_timeout_rxb_txb.c diff --git a/examples/utest/testcases/drivers/serial_v2/uart_timeout_txb.c b/components/drivers/serial/utest/v2/uart_timeout_txb.c similarity index 100% rename from examples/utest/testcases/drivers/serial_v2/uart_timeout_txb.c rename to components/drivers/serial/utest/v2/uart_timeout_txb.c diff --git a/examples/utest/testcases/drivers/serial_bypass/Kconfig b/examples/utest/testcases/drivers/serial_bypass/Kconfig deleted file mode 100644 index 5fc356286d..0000000000 --- a/examples/utest/testcases/drivers/serial_bypass/Kconfig +++ /dev/null @@ -1,8 +0,0 @@ -menu "Serial-Bypass Testcase" - -config UTEST_SERIAL_BYPASS - bool "Serial testcase" - default n - depends on RT_USING_SERIAL_BYPASS - -endmenu