27 files changed, 3 insertions, 1 deletions

diff --git a/Kconfig.utestcases b/Kconfig.utestcases
index 69a8a43885..64162324b6 100644
--- a/Kconfig.utestcases
+++ b/Kconfig.utestcases
@@ -22,12 +22,12 @@ menu "RT-Thread Utestcases"
 
             rsource "components/dfs/utest/Kconfig"
             rsource "components/libc/cplusplus/utest/Kconfig"
+            rsource "components/mm/utest/Kconfig"
             rsource "components/net/utest/Kconfig"
             rsource "components/utilities/utest/utest/Kconfig"
 
         endmenu
 
-        rsource "examples/utest/testcases/mm/Kconfig"
         rsource "examples/utest/testcases/tmpfs/Kconfig"
 
 endif
diff --git a/components/mm/SConscript b/components/mm/SConscript
index 39e4f6bbcf..5b259fee10 100644
--- a/components/mm/SConscript
+++ b/components/mm/SConscript
@@ -13,4 +13,6 @@ if GetDepend('ARCH_ARM_CORTEX_A') or GetDepend('ARCH_ARMV8') or GetDepend('ARCH_
 
     group = DefineGroup('Memm', src, depend = ['ARCH_MM_MMU'], CPPPATH = CPPPATH)
 
+group = group + SConscript(os.path.join('utest', 'SConscript'))
+
 Return('group')
diff --git a/examples/utest/testcases/mm/Kconfig b/components/mm/utest/Kconfig
index 434df5b934..434df5b934 100644
--- a/examples/utest/testcases/mm/Kconfig
+++ b/components/mm/utest/Kconfig
diff --git a/examples/utest/testcases/mm/SConscript b/components/mm/utest/SConscript
index edef3914f1..edef3914f1 100644
--- a/examples/utest/testcases/mm/SConscript
+++ b/components/mm/utest/SConscript
diff --git a/examples/utest/testcases/mm/aspace_map_expand.c b/components/mm/utest/aspace_map_expand.c
index 2fd70f1da0..2fd70f1da0 100644
--- a/examples/utest/testcases/mm/aspace_map_expand.c
+++ b/components/mm/utest/aspace_map_expand.c
diff --git a/examples/utest/testcases/mm/aspace_unmap_range_invalid_param.c b/components/mm/utest/aspace_unmap_range_invalid_param.c
index 1beec1aa8a..1beec1aa8a 100644
--- a/examples/utest/testcases/mm/aspace_unmap_range_invalid_param.c
+++ b/components/mm/utest/aspace_unmap_range_invalid_param.c
diff --git a/examples/utest/testcases/mm/aspace_unmap_range_shrink.c b/components/mm/utest/aspace_unmap_range_shrink.c
index de52572d52..de52572d52 100644
--- a/examples/utest/testcases/mm/aspace_unmap_range_shrink.c
+++ b/components/mm/utest/aspace_unmap_range_shrink.c
diff --git a/examples/utest/testcases/mm/aspace_unmap_range_split.c b/components/mm/utest/aspace_unmap_range_split.c
index 07489df693..07489df693 100644
--- a/examples/utest/testcases/mm/aspace_unmap_range_split.c
+++ b/components/mm/utest/aspace_unmap_range_split.c
diff --git a/examples/utest/testcases/mm/common.h b/components/mm/utest/common.h
index 3255e166ca..3255e166ca 100644
--- a/examples/utest/testcases/mm/common.h
+++ b/components/mm/utest/common.h
diff --git a/examples/utest/testcases/mm/lwp_mmap_expand.c b/components/mm/utest/lwp_mmap_expand.c
index ee54f150fa..ee54f150fa 100644
--- a/examples/utest/testcases/mm/lwp_mmap_expand.c
+++ b/components/mm/utest/lwp_mmap_expand.c
diff --git a/examples/utest/testcases/mm/lwp_mmap_fd.c b/components/mm/utest/lwp_mmap_fd.c
index da2e4f8edf..da2e4f8edf 100644
--- a/examples/utest/testcases/mm/lwp_mmap_fd.c
+++ b/components/mm/utest/lwp_mmap_fd.c
diff --git a/examples/utest/testcases/mm/lwp_mmap_fd_map_fixed_merge.c b/components/mm/utest/lwp_mmap_fd_map_fixed_merge.c
index b33606618e..b33606618e 100644
--- a/examples/utest/testcases/mm/lwp_mmap_fd_map_fixed_merge.c
+++ b/components/mm/utest/lwp_mmap_fd_map_fixed_merge.c
diff --git a/examples/utest/testcases/mm/lwp_mmap_fd_map_fixed_split.c b/components/mm/utest/lwp_mmap_fd_map_fixed_split.c
index 7f7ef23b30..7f7ef23b30 100644
--- a/examples/utest/testcases/mm/lwp_mmap_fd_map_fixed_split.c
+++ b/components/mm/utest/lwp_mmap_fd_map_fixed_split.c
diff --git a/examples/utest/testcases/mm/lwp_mmap_fix_private.c b/components/mm/utest/lwp_mmap_fix_private.c
index 22261e4b4f..22261e4b4f 100644
--- a/examples/utest/testcases/mm/lwp_mmap_fix_private.c
+++ b/components/mm/utest/lwp_mmap_fix_private.c
diff --git a/examples/utest/testcases/mm/lwp_mmap_map_fixed.c b/components/mm/utest/lwp_mmap_map_fixed.c
index affc514037..affc514037 100644
--- a/examples/utest/testcases/mm/lwp_mmap_map_fixed.c
+++ b/components/mm/utest/lwp_mmap_map_fixed.c
diff --git a/examples/utest/testcases/mm/mm_api_tc.c b/components/mm/utest/mm_api_tc.c
index d7fcdffb00..d7fcdffb00 100644
--- a/examples/utest/testcases/mm/mm_api_tc.c
+++ b/components/mm/utest/mm_api_tc.c
diff --git a/examples/utest/testcases/mm/mm_libcpu_tc.c b/components/mm/utest/mm_libcpu_tc.c
index a8e9c5c06b..a8e9c5c06b 100644
--- a/examples/utest/testcases/mm/mm_libcpu_tc.c
+++ b/components/mm/utest/mm_libcpu_tc.c
diff --git a/examples/utest/testcases/mm/mm_lwp_tc.c b/components/mm/utest/mm_lwp_tc.c
index d38a27341d..d38a27341d 100644
--- a/examples/utest/testcases/mm/mm_lwp_tc.c
+++ b/components/mm/utest/mm_lwp_tc.c
diff --git a/examples/utest/testcases/mm/mm_memblock_tc.c b/components/mm/utest/mm_memblock_tc.c
index e99c951c76..e99c951c76 100644
--- a/examples/utest/testcases/mm/mm_memblock_tc.c
+++ b/components/mm/utest/mm_memblock_tc.c
diff --git a/examples/utest/testcases/mm/rt_ioremap.c b/components/mm/utest/rt_ioremap.c
index d61dceec42..d61dceec42 100644
--- a/examples/utest/testcases/mm/rt_ioremap.c
+++ b/components/mm/utest/rt_ioremap.c
diff --git a/examples/utest/testcases/mm/semaphore.h b/components/mm/utest/semaphore.h
index 076f820cf2..076f820cf2 100644
--- a/examples/utest/testcases/mm/semaphore.h
+++ b/components/mm/utest/semaphore.h
diff --git a/examples/utest/testcases/mm/test_aspace_api.h b/components/mm/utest/test_aspace_api.h
index 2213888c28..2213888c28 100644
--- a/examples/utest/testcases/mm/test_aspace_api.h
+++ b/components/mm/utest/test_aspace_api.h
diff --git a/examples/utest/testcases/mm/test_aspace_api_internal.h b/components/mm/utest/test_aspace_api_internal.h
index 953424f07c..953424f07c 100644
--- a/examples/utest/testcases/mm/test_aspace_api_internal.h
+++ b/components/mm/utest/test_aspace_api_internal.h
diff --git a/examples/utest/testcases/mm/test_bst_adpt.h b/components/mm/utest/test_bst_adpt.h
index e081a754bb..e081a754bb 100644
--- a/examples/utest/testcases/mm/test_bst_adpt.h
+++ b/components/mm/utest/test_bst_adpt.h
diff --git a/examples/utest/testcases/mm/test_cache_aarch64.h b/components/mm/utest/test_cache_aarch64.h
index b103eda213..b103eda213 100644
--- a/examples/utest/testcases/mm/test_cache_aarch64.h
+++ b/components/mm/utest/test_cache_aarch64.h
diff --git a/examples/utest/testcases/mm/test_cache_rv64.h b/components/mm/utest/test_cache_rv64.h
index 3bd7fc26eb..3bd7fc26eb 100644
--- a/examples/utest/testcases/mm/test_cache_rv64.h
+++ b/components/mm/utest/test_cache_rv64.h
diff --git a/examples/utest/testcases/mm/test_synchronization.h b/components/mm/utest/test_synchronization.h
index 7f813ec1f8..7f813ec1f8 100644
--- a/examples/utest/testcases/mm/test_synchronization.h
+++ b/components/mm/utest/test_synchronization.h