31 files changed, 32 insertions, 15 deletions
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
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
index 86be64011b..86be64011b 100644
--- a/examples/utest/testcases/drivers/serial_bypass/SConscript
+++ b/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
index 175a45a108..175a45a108 100644
--- a/examples/utest/testcases/drivers/serial_bypass/bypass_conflict.c
+++ b/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
index 5cfb3cc197..5cfb3cc197 100644
--- a/examples/utest/testcases/drivers/serial_bypass/bypass_lower_run.c
+++ b/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
index df4e07b9aa..df4e07b9aa 100644
--- a/examples/utest/testcases/drivers/serial_bypass/bypass_register.c
+++ b/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
index c5c1499687..c5c1499687 100644
--- a/examples/utest/testcases/drivers/serial_bypass/bypass_upper_run.c
+++ b/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
index 1a94c20a01..1a94c20a01 100644
--- a/examples/utest/testcases/drivers/serial_v2/README.md
+++ b/components/drivers/serial/utest/v2/README.md
diff --git a/examples/utest/testcases/drivers/serial_v2/SConscript b/components/drivers/serial/utest/v2/SConscript
index 7ef99d20b7..7ef99d20b7 100644
--- a/examples/utest/testcases/drivers/serial_v2/SConscript
+++ b/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
index bb273f1328..bb273f1328 100644
--- 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
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
index 943b47b345..943b47b345 100644
--- a/examples/utest/testcases/drivers/serial_v2/posix/uart_posix_nonblock.c
+++ b/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
index 5fdaa97793..5fdaa97793 100644
--- a/examples/utest/testcases/drivers/serial_v2/qemu/uart_qemu_echo.c
+++ b/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
index 1d2ab4e586..1d2ab4e586 100644
--- a/examples/utest/testcases/drivers/serial_v2/uart_blocking_rx.c
+++ b/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
index 51eda0feb9..51eda0feb9 100644
--- a/examples/utest/testcases/drivers/serial_v2/uart_blocking_tx.c
+++ b/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
index 3d529d7f46..3d529d7f46 100644
--- a/examples/utest/testcases/drivers/serial_v2/uart_flush_rx.c
+++ b/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
index 2bc45a3250..2bc45a3250 100644
--- a/examples/utest/testcases/drivers/serial_v2/uart_flush_txb.c
+++ b/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
index 1fcfc2b99d..1fcfc2b99d 100644
--- a/examples/utest/testcases/drivers/serial_v2/uart_flush_txnb.c
+++ b/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
index f63f663ad3..f63f663ad3 100644
--- 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
diff --git a/examples/utest/testcases/drivers/serial_v2/uart_nonblocking_rx.c b/components/drivers/serial/utest/v2/uart_nonblocking_rx.c
index d67a5d17ae..d67a5d17ae 100644
--- a/examples/utest/testcases/drivers/serial_v2/uart_nonblocking_rx.c
+++ b/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
index cd1297d919..cd1297d919 100644
--- a/examples/utest/testcases/drivers/serial_v2/uart_nonblocking_tx.c
+++ b/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
index e5a354f75a..e5a354f75a 100644
--- a/examples/utest/testcases/drivers/serial_v2/uart_overflow_rxb_txb.c
+++ b/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
index b844cc05b2..b844cc05b2 100644
--- a/examples/utest/testcases/drivers/serial_v2/uart_rxb_txb.c
+++ b/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
index b5e4fe6e86..b5e4fe6e86 100644
--- a/examples/utest/testcases/drivers/serial_v2/uart_rxb_txnb.c
+++ b/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
index 6dc7f68346..6dc7f68346 100644
--- a/examples/utest/testcases/drivers/serial_v2/uart_rxnb_txb.c
+++ b/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
index 66c40c103d..66c40c103d 100644
--- a/examples/utest/testcases/drivers/serial_v2/uart_rxnb_txnb.c
+++ b/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
index 7c936bbfe8..7c936bbfe8 100644
--- a/examples/utest/testcases/drivers/serial_v2/uart_timeout_rxb.c
+++ b/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
index 7defec6803..7defec6803 100644
--- a/examples/utest/testcases/drivers/serial_v2/uart_timeout_rxb_txb.c
+++ b/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
index 9af3f40b3e..9af3f40b3e 100644
--- a/examples/utest/testcases/drivers/serial_v2/uart_timeout_txb.c
+++ b/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