apache · xiaoxiang781216 · Jan 23, 2025 · Jan 22, 2025
diff --git a/testing/mm/.gitignore b/testing/mm/.gitignore
@@ -0,0 +1 @@
+/Kconfig
diff --git a/testing/mm/CMakeLists.txt b/testing/mm/CMakeLists.txt
@@ -20,18 +20,5 @@
 #
 # ##############################################################################
 
-if(CONFIG_TESTING_MM)
-  nuttx_add_application(
-    NAME
-    ${CONFIG_TESTING_MM_PROGNAME}
-    PRIORITY
-    ${CONFIG_TESTING_MM_PRIORITY}
-    STACKSIZE
-    ${CONFIG_TESTING_MM_STACKSIZE}
-    MODULE
-    ${CONFIG_TESTING_MM}
-    INCLUDE_DIRECTORIES
-    ${NUTTX_DIR}/mm/mm_heap
-    SRCS
-    mm_main.c)
-endif()
+nuttx_add_subdirectory()
+nuttx_generate_kconfig(MENUDESC "mm")
diff --git a/testing/mm/Make.defs b/testing/mm/Make.defs
@@ -20,6 +20,4 @@
 #
 ############################################################################
 
-ifneq ($(CONFIG_TESTING_MM),)
-CONFIGURED_APPS += $(APPDIR)/testing/mm
-endif
+include $(wildcard $(APPDIR)/testing/mm/*/Make.defs)
diff --git a/testing/mm/Makefile b/testing/mm/Makefile
@@ -20,17 +20,6 @@
 #
 ############################################################################
 
-include $(APPDIR)/Make.defs
+MENUDESC = "mm"
 
-# Memory Management Test
-
-PROGNAME  = $(CONFIG_TESTING_MM_PROGNAME)
-PRIORITY  = $(CONFIG_TESTING_MM_PRIORITY)
-STACKSIZE = $(CONFIG_TESTING_MM_STACKSIZE)
-MODULE    = $(CONFIG_TESTING_MM)
-
-MAINSRC = mm_main.c
-
-CFLAGS += -I$(TOPDIR)/mm/mm_heap
-
-include $(APPDIR)/Application.mk
+include $(APPDIR)/Directory.mk
diff --git a/testing/cachetest/CMakeLists.txt → testing/mm/cachetest/CMakeLists.txt b/testing/cachetest/CMakeLists.txt → testing/mm/cachetest/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ##############################################################################
-# apps/testing/cachetest/CMakeLists.txt
+# apps/testing/mm/cachetest/CMakeLists.txt
 #
 # SPDX-License-Identifier: Apache-2.0
 #

diff --git a/testing/cachetest/Kconfig → testing/mm/cachetest/Kconfig b/testing/cachetest/Kconfig → testing/mm/cachetest/Kconfig
diff --git a/testing/cachetest/Make.defs → testing/mm/cachetest/Make.defs b/testing/cachetest/Make.defs → testing/mm/cachetest/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/cachetest/Make.defs
+# apps/testing/mm/cachetest/Make.defs
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -21,5 +21,5 @@
 ############################################################################
 
 ifneq ($(CONFIG_TESTING_CACHETEST),)
-CONFIGURED_APPS += $(APPDIR)/testing/cachetest
+CONFIGURED_APPS += $(APPDIR)/testing/mm/cachetest
 endif
diff --git a/testing/cachetest/Makefile → testing/mm/cachetest/Makefile b/testing/cachetest/Makefile → testing/mm/cachetest/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/cachetest/Makefile
+# apps/testing/mm/cachetest/Makefile
 #
 # SPDX-License-Identifier: Apache-2.0
 #

diff --git a/testing/cachetest/cachetest_main.c → testing/mm/cachetest/cachetest_main.c b/testing/cachetest/cachetest_main.c → testing/mm/cachetest/cachetest_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/cachetest/cachetest_main.c
+ * apps/testing/mm/cachetest/cachetest_main.c
  *
  * SPDX-License-Identifier: Apache-2.0
  *

diff --git a/testing/mm/heaptest/CMakeLists.txt b/testing/mm/heaptest/CMakeLists.txt
@@ -0,0 +1,37 @@
+# ##############################################################################
+# apps/testing/mm/heaptest/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_TESTING_HEAP)
+  nuttx_add_application(
+    NAME
+    ${CONFIG_TESTING_HEAP_PROGNAME}
+    PRIORITY
+    ${CONFIG_TESTING_HEAP_PRIORITY}
+    STACKSIZE
+    ${CONFIG_TESTING_HEAP_STACKSIZE}
+    MODULE
+    ${CONFIG_TESTING_HEAP}
+    INCLUDE_DIRECTORIES
+    ${NUTTX_DIR}/mm/mm_heap
+    SRCS
+    heap_main.c)
+endif()
diff --git a/testing/mm/Kconfig → testing/mm/heaptest/Kconfig b/testing/mm/Kconfig → testing/mm/heaptest/Kconfig
@@ -3,30 +3,30 @@
 # see the file kconfig-language.txt in the NuttX tools repository.
 #
 
-config TESTING_MM
+config TESTING_HEAP
 	tristate "Memory management test"
 	default n
 	---help---
 		Enable the memory management test
 
-if TESTING_MM
+if TESTING_HEAP
 
-config TESTING_MM_PROGNAME
+config TESTING_HEAP_PROGNAME
 	string "Program name"
-	default "mm"
+	default "heap"
 	---help---
 		This is the name of the program that will be used when the NSH ELF
 		program is installed.
 
-config TESTING_MM_PRIORITY
+config TESTING_HEAP_PRIORITY
 	int "Task priority"
 	default 100
 
-config TESTING_MM_STACKSIZE
+config TESTING_HEAP_STACKSIZE
 	int "Stack size"
 	default DEFAULT_TASK_STACKSIZE
 
-config TESTING_MM_POWEROFF
+config TESTING_HEAP_POWEROFF
 	bool "Terminate on test completion"
 	default n
 	depends on BOARDCTL_POWEROFF

diff --git a/testing/mm/heaptest/Make.defs b/testing/mm/heaptest/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/testing/mm/heaptest/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_TESTING_HEAP),)
+CONFIGURED_APPS += $(APPDIR)/testing/mm/heaptest
+endif
diff --git a/testing/mm/heaptest/Makefile b/testing/mm/heaptest/Makefile
@@ -0,0 +1,36 @@
+############################################################################
+# apps/testing/mm/heaptest/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+# Memory Management Test
+
+PROGNAME  = $(CONFIG_TESTING_HEAP_PROGNAME)
+PRIORITY  = $(CONFIG_TESTING_HEAP_PRIORITY)
+STACKSIZE = $(CONFIG_TESTING_HEAP_STACKSIZE)
+MODULE    = $(CONFIG_TESTING_HEAP)
+
+MAINSRC = heap_main.c
+
+CFLAGS += -I$(TOPDIR)/mm/mm_heap
+
+include $(APPDIR)/Application.mk
diff --git a/testing/mm/mm_main.c → testing/mm/heaptest/heap_main.c b/testing/mm/mm_main.c → testing/mm/heaptest/heap_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/mm/mm_main.c
+ * apps/testing/mm/heaptest/heap_main.c
  *
  * SPDX-License-Identifier: Apache-2.0
  *

diff --git a/testing/iob/CMakeLists.txt → testing/mm/iob/CMakeLists.txt b/testing/iob/CMakeLists.txt → testing/mm/iob/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ##############################################################################
-# apps/testing/iob/CMakeLists.txt
+# apps/testing/mm/iob/CMakeLists.txt
 #
 # SPDX-License-Identifier: Apache-2.0
 #

diff --git a/testing/iob/Kconfig → testing/mm/iob/Kconfig b/testing/iob/Kconfig → testing/mm/iob/Kconfig
diff --git a/testing/iob/Make.defs → testing/mm/iob/Make.defs b/testing/iob/Make.defs → testing/mm/iob/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/iob/Make.defs
+# apps/testing/mm/iob/Make.defs
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -21,5 +21,5 @@
 ############################################################################
 
 ifneq ($(CONFIG_TESTING_IOB),)
-CONFIGURED_APPS += $(APPDIR)/testing/iob
+CONFIGURED_APPS += $(APPDIR)/testing/mm/iob
 endif
diff --git a/testing/iob/Makefile → testing/mm/iob/Makefile b/testing/iob/Makefile → testing/mm/iob/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/iob/Makefile
+# apps/testing/mm/iob/Makefile
 #
 # SPDX-License-Identifier: Apache-2.0
 #

diff --git a/testing/iob/iob_main.c → testing/mm/iob/iob_main.c b/testing/iob/iob_main.c → testing/mm/iob/iob_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/iob/iob_main.c
+ * apps/testing/mm/iob/iob_main.c
  *
  * SPDX-License-Identifier: Apache-2.0
  *

diff --git a/testing/kasantest/CMakeLists.txt → testing/mm/kasantest/CMakeLists.txt b/testing/kasantest/CMakeLists.txt → testing/mm/kasantest/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ##############################################################################
-# apps/testing/kasantest/CMakeLists.txt
+# apps/testing/mm/kasantest/CMakeLists.txt
 #
 # SPDX-License-Identifier: Apache-2.0
 #

diff --git a/testing/kasantest/Kconfig → testing/mm/kasantest/Kconfig b/testing/kasantest/Kconfig → testing/mm/kasantest/Kconfig
diff --git a/testing/kasantest/Make.defs → testing/mm/kasantest/Make.defs b/testing/kasantest/Make.defs → testing/mm/kasantest/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/kasantest/Make.defs
+# apps/testing/mm/kasantest/Make.defs
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -21,5 +21,5 @@
 ############################################################################
 
 ifneq ($(CONFIG_TESTING_KASAN),)
-CONFIGURED_APPS += $(APPDIR)/testing/kasantest
+CONFIGURED_APPS += $(APPDIR)/testing/mm/kasantest
 endif
diff --git a/testing/kasantest/Makefile → testing/mm/kasantest/Makefile b/testing/kasantest/Makefile → testing/mm/kasantest/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/kasantest/Makefile
+# apps/testing/mm/kasantest/Makefile
 #
 # SPDX-License-Identifier: Apache-2.0
 #

diff --git a/testing/kasantest/kasantest.c → testing/mm/kasantest/kasantest.c b/testing/kasantest/kasantest.c → testing/mm/kasantest/kasantest.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/kasantest/kasantest.c
+ * apps/testing/mm/kasantest/kasantest.c
  *
  * SPDX-License-Identifier: Apache-2.0
  *

diff --git a/testing/memstress/CMakeLists.txt → testing/mm/memstress/CMakeLists.txt b/testing/memstress/CMakeLists.txt → testing/mm/memstress/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ##############################################################################
-# apps/testing/memstress/CMakeLists.txt
+# apps/testing/mm/memstress/CMakeLists.txt
 #
 # SPDX-License-Identifier: Apache-2.0
 #

diff --git a/testing/memstress/Kconfig → testing/mm/memstress/Kconfig b/testing/memstress/Kconfig → testing/mm/memstress/Kconfig
diff --git a/testing/memstress/Make.defs → testing/mm/memstress/Make.defs b/testing/memstress/Make.defs → testing/mm/memstress/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/memstress/Make.defs
+# apps/testing/mm/memstress/Make.defs
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -21,5 +21,5 @@
 ############################################################################
 
 ifneq ($(CONFIG_TESTING_MEMORY_STRESS),)
-CONFIGURED_APPS += $(APPDIR)/testing/memstress
+CONFIGURED_APPS += $(APPDIR)/testing/mm/memstress
 endif
diff --git a/testing/memstress/Makefile → testing/mm/memstress/Makefile b/testing/memstress/Makefile → testing/mm/memstress/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/memstress/Makefile
+# apps/testing/mm/memstress/Makefile
 #
 # SPDX-License-Identifier: Apache-2.0
 #

diff --git a/testing/memstress/memorystress_main.c → testing/mm/memstress/memorystress_main.c b/testing/memstress/memorystress_main.c → testing/mm/memstress/memorystress_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/memstress/memorystress_main.c
+ * apps/testing/mm/memstress/memorystress_main.c
  *
  * SPDX-License-Identifier: Apache-2.0
  *

diff --git a/testing/memtester/.gitignore → testing/mm/memtester/.gitignore b/testing/memtester/.gitignore → testing/mm/memtester/.gitignore
diff --git a/testing/memtester/CMakeLists.txt → testing/mm/memtester/CMakeLists.txt b/testing/memtester/CMakeLists.txt → testing/mm/memtester/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ##############################################################################
-# apps/testing/memtester/CMakeLists.txt
+# apps/testing/mm/memtester/CMakeLists.txt
 #
 # SPDX-License-Identifier: Apache-2.0
 #

diff --git a/testing/memtester/Kconfig → testing/mm/memtester/Kconfig b/testing/memtester/Kconfig → testing/mm/memtester/Kconfig
diff --git a/testing/memtester/Make.defs → testing/mm/memtester/Make.defs b/testing/memtester/Make.defs → testing/mm/memtester/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/memtester/Make.defs
+# apps/testing/mm/memtester/Make.defs
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -21,5 +21,5 @@
 ############################################################################
 
 ifneq ($(CONFIG_UTILS_MEMTESTER),)
-CONFIGURED_APPS += $(APPDIR)/testing/memtester
+CONFIGURED_APPS += $(APPDIR)/testing/mm/memtester
 endif
diff --git a/testing/memtester/Makefile → testing/mm/memtester/Makefile b/testing/memtester/Makefile → testing/mm/memtester/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/memtester/Makefile
+# apps/testing/mm/memtester/Makefile
 #
 # SPDX-License-Identifier: Apache-2.0
 #

diff --git a/testing/ramtest/CMakeLists.txt → testing/mm/ramtest/CMakeLists.txt b/testing/ramtest/CMakeLists.txt → testing/mm/ramtest/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ##############################################################################
-# apps/testing/ramtest/CMakeLists.txt
+# apps/testing/mm/ramtest/CMakeLists.txt
 #
 # SPDX-License-Identifier: Apache-2.0
 #

diff --git a/testing/ramtest/Kconfig → testing/mm/ramtest/Kconfig b/testing/ramtest/Kconfig → testing/mm/ramtest/Kconfig
diff --git a/testing/ramtest/Make.defs → testing/mm/ramtest/Make.defs b/testing/ramtest/Make.defs → testing/mm/ramtest/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/ramtest/Make.defs
+# apps/testing/mm/ramtest/Make.defs
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -21,5 +21,5 @@
 ############################################################################
 
 ifneq ($(CONFIG_TESTING_RAMTEST),)
-CONFIGURED_APPS += $(APPDIR)/testing/ramtest
+CONFIGURED_APPS += $(APPDIR)/testing/mm/ramtest
 endif
diff --git a/testing/ramtest/Makefile → testing/mm/ramtest/Makefile b/testing/ramtest/Makefile → testing/mm/ramtest/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/ramtest/Makefile
+# apps/testing/mm/ramtest/Makefile
 #
 # SPDX-License-Identifier: Apache-2.0
 #

diff --git a/testing/ramtest/ramtest.c → testing/mm/ramtest/ramtest.c b/testing/ramtest/ramtest.c → testing/mm/ramtest/ramtest.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/ramtest/ramtest.c
+ * apps/testing/mm/ramtest/ramtest.c
  *
  * SPDX-License-Identifier: Apache-2.0
  *

diff --git a/testing/stressapptest/.gitignore → testing/mm/stressapptest/.gitignore b/testing/stressapptest/.gitignore → testing/mm/stressapptest/.gitignore