testing:merge apps-testing-dir case to the same directory

Signed-off-by: tengshuangshuang <[email protected]>
apache · Jan 8, 2025 · def1082 · def1082
1 parent 6c7bc3c
commit def1082
Show file tree

Hide file tree

Showing 269 changed files with 787 additions and 175 deletions.
diff --git a/testing/cxx/Make.defs b/testing/cxx/Make.defs
@@ -0,0 +1,23 @@
+############################################################################
+# apps/testing/cxx/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.
+#
+############################################################################
+
+include $(wildcard $(APPDIR)/testing/cxx/*/Make.defs)
diff --git a/testing/cxx/Makefile b/testing/cxx/Makefile
@@ -0,0 +1,25 @@
+############################################################################
+# apps/testing/cxx/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.
+#
+############################################################################
+
+MENUDESC = "cxx"
+
+include $(APPDIR)/Directory.mk
diff --git a/testing/cxxsize/CMakeLists.txt → testing/cxx/cxxsize/CMakeLists.txt b/testing/cxxsize/CMakeLists.txt → testing/cxx/cxxsize/CMakeLists.txt
diff --git a/testing/cxxsize/Kconfig → testing/cxx/cxxsize/Kconfig b/testing/cxxsize/Kconfig → testing/cxx/cxxsize/Kconfig
diff --git a/testing/cxxsize/Make.defs → testing/cxx/cxxsize/Make.defs b/testing/cxxsize/Make.defs → testing/cxx/cxxsize/Make.defs
@@ -21,5 +21,5 @@
 ############################################################################
 
 ifneq ($(CONFIG_TESTING_CXXSIZE),)
-CONFIGURED_APPS += $(APPDIR)/testing/cxxsize
+CONFIGURED_APPS += $(APPDIR)/testing/cxx/cxxsize
 endif
diff --git a/testing/cxxsize/Makefile → testing/cxx/cxxsize/Makefile b/testing/cxxsize/Makefile → testing/cxx/cxxsize/Makefile
diff --git a/testing/cxxsize/README.md → testing/cxx/cxxsize/README.md b/testing/cxxsize/README.md → testing/cxx/cxxsize/README.md
diff --git a/testing/cxxsize/array.cxx → testing/cxx/cxxsize/array.cxx b/testing/cxxsize/array.cxx → testing/cxx/cxxsize/array.cxx
diff --git a/testing/cxxsize/condition_variable.cxx → testing/cxx/cxxsize/condition_variable.cxx b/testing/cxxsize/condition_variable.cxx → testing/cxx/cxxsize/condition_variable.cxx
diff --git a/testing/cxxsize/deque.cxx → testing/cxx/cxxsize/deque.cxx b/testing/cxxsize/deque.cxx → testing/cxx/cxxsize/deque.cxx
diff --git a/testing/cxxsize/exception.cxx → testing/cxx/cxxsize/exception.cxx b/testing/cxxsize/exception.cxx → testing/cxx/cxxsize/exception.cxx
diff --git a/testing/cxxsize/forward_list.cxx → testing/cxx/cxxsize/forward_list.cxx b/testing/cxxsize/forward_list.cxx → testing/cxx/cxxsize/forward_list.cxx
diff --git a/testing/cxxsize/future.cxx → testing/cxx/cxxsize/future.cxx b/testing/cxxsize/future.cxx → testing/cxx/cxxsize/future.cxx
diff --git a/testing/cxxsize/iostream.cxx → testing/cxx/cxxsize/iostream.cxx b/testing/cxxsize/iostream.cxx → testing/cxx/cxxsize/iostream.cxx
diff --git a/testing/cxxsize/list.cxx → testing/cxx/cxxsize/list.cxx b/testing/cxxsize/list.cxx → testing/cxx/cxxsize/list.cxx
diff --git a/testing/cxxsize/map.cxx → testing/cxx/cxxsize/map.cxx b/testing/cxxsize/map.cxx → testing/cxx/cxxsize/map.cxx
diff --git a/testing/cxxsize/multiset.cxx → testing/cxx/cxxsize/multiset.cxx b/testing/cxxsize/multiset.cxx → testing/cxx/cxxsize/multiset.cxx
diff --git a/testing/cxxsize/mutex.cxx → testing/cxx/cxxsize/mutex.cxx b/testing/cxxsize/mutex.cxx → testing/cxx/cxxsize/mutex.cxx
diff --git a/testing/cxxsize/rtti.cxx → testing/cxx/cxxsize/rtti.cxx b/testing/cxxsize/rtti.cxx → testing/cxx/cxxsize/rtti.cxx
diff --git a/testing/cxxsize/semaphore.cxx → testing/cxx/cxxsize/semaphore.cxx b/testing/cxxsize/semaphore.cxx → testing/cxx/cxxsize/semaphore.cxx
diff --git a/testing/cxxsize/set.cxx → testing/cxx/cxxsize/set.cxx b/testing/cxxsize/set.cxx → testing/cxx/cxxsize/set.cxx
diff --git a/testing/cxxsize/shared_ptr.cxx → testing/cxx/cxxsize/shared_ptr.cxx b/testing/cxxsize/shared_ptr.cxx → testing/cxx/cxxsize/shared_ptr.cxx
diff --git a/testing/cxxsize/string.cxx → testing/cxx/cxxsize/string.cxx b/testing/cxxsize/string.cxx → testing/cxx/cxxsize/string.cxx
diff --git a/testing/cxxsize/string_view.cxx → testing/cxx/cxxsize/string_view.cxx b/testing/cxxsize/string_view.cxx → testing/cxx/cxxsize/string_view.cxx
diff --git a/testing/cxxsize/thread.cxx → testing/cxx/cxxsize/thread.cxx b/testing/cxxsize/thread.cxx → testing/cxx/cxxsize/thread.cxx
diff --git a/testing/cxxsize/unordered_map.cxx → testing/cxx/cxxsize/unordered_map.cxx b/testing/cxxsize/unordered_map.cxx → testing/cxx/cxxsize/unordered_map.cxx
diff --git a/testing/cxxsize/unordered_multimap.cxx → testing/cxx/cxxsize/unordered_multimap.cxx b/testing/cxxsize/unordered_multimap.cxx → testing/cxx/cxxsize/unordered_multimap.cxx
diff --git a/testing/cxxsize/unordered_multiset.cxx → testing/cxx/cxxsize/unordered_multiset.cxx b/testing/cxxsize/unordered_multiset.cxx → testing/cxx/cxxsize/unordered_multiset.cxx
diff --git a/testing/cxxsize/unordered_set.cxx → testing/cxx/cxxsize/unordered_set.cxx b/testing/cxxsize/unordered_set.cxx → testing/cxx/cxxsize/unordered_set.cxx
diff --git a/testing/cxxsize/vector.cxx → testing/cxx/cxxsize/vector.cxx b/testing/cxxsize/vector.cxx → testing/cxx/cxxsize/vector.cxx
diff --git a/testing/cxxsize/weak_ptr.cxx → testing/cxx/cxxsize/weak_ptr.cxx b/testing/cxxsize/weak_ptr.cxx → testing/cxx/cxxsize/weak_ptr.cxx
diff --git a/testing/cxxtest/CMakeLists.txt → testing/cxx/cxxtest/CMakeLists.txt b/testing/cxxtest/CMakeLists.txt → testing/cxx/cxxtest/CMakeLists.txt
diff --git a/testing/cxxtest/Kconfig → testing/cxx/cxxtest/Kconfig b/testing/cxxtest/Kconfig → testing/cxx/cxxtest/Kconfig
diff --git a/testing/cxxtest/Make.defs → testing/cxx/cxxtest/Make.defs b/testing/cxxtest/Make.defs → testing/cxx/cxxtest/Make.defs
@@ -21,5 +21,5 @@
 ############################################################################
 
 ifneq ($(CONFIG_TESTING_CXXTEST),)
-CONFIGURED_APPS += $(APPDIR)/testing/cxxtest
+CONFIGURED_APPS += $(APPDIR)/testing/cxx/cxxtest
 endif
diff --git a/testing/cxxtest/Makefile → testing/cxx/cxxtest/Makefile b/testing/cxxtest/Makefile → testing/cxx/cxxtest/Makefile
diff --git a/testing/cxxtest/cxxtest_main.cxx → testing/cxx/cxxtest/cxxtest_main.cxx b/testing/cxxtest/cxxtest_main.cxx → testing/cxx/cxxtest/cxxtest_main.cxx
diff --git a/testing/fs/Make.defs b/testing/fs/Make.defs
@@ -0,0 +1,23 @@
+############################################################################
+# apps/testing/fs/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.
+#
+############################################################################
+
+include $(wildcard $(APPDIR)/testing/fs/*/Make.defs)
diff --git a/testing/fs/Makefile b/testing/fs/Makefile
@@ -0,0 +1,25 @@
+############################################################################
+# apps/testing/fs/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.
+#
+############################################################################
+
+MENUDESC = "fs"
+
+include $(APPDIR)/Directory.mk
diff --git a/testing/fs/cmocka/Kconfig b/testing/fs/cmocka/Kconfig
@@ -0,0 +1,12 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+if TESTS_TESTSUITES
+
+config CM_FS_TEST
+	bool "enable fs test"
+	default n
+
+endif
diff --git a/testing/fs/cmocka/Make.defs b/testing/fs/cmocka/Make.defs
@@ -0,0 +1,26 @@
+############################################################################
+# apps/testing/fs/cmocka/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_TESTS_TESTSUITES),)
+CONFIGURED_APPS += $(APPDIR)/testing/fs/cmocka
+endif
diff --git a/testing/fs/cmocka/Makefile b/testing/fs/cmocka/Makefile
@@ -0,0 +1,39 @@
+############################################################################
+# apps/testing/fs/cmocka/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
+
+
+PRIORITY = $(CONFIG_TESTS_TESTSUITES_PRIORITY)
+STACKSIZE = $(CONFIG_TESTS_TESTSUITES_STACKSIZE)
+MODULE = $(CONFIG_TESTS_TESTSUITES)
+
+ifneq ($(CONFIG_CM_FS_TEST),)
+CFLAGS += -I$(CURDIR)/include
+CFLAGS += -I$(APPDIR)/nshlib
+CSRCS += $(wildcard cases/*.c)
+CSRCS += $(wildcard common/*.c)
+PROGNAME += cmocka_fs_test
+MAINSRC += $(CURDIR)/cmocka_fs_test.c
+endif
+
+include $(APPDIR)/Application.mk
diff --git a/...stsuites/kernel/fs/cases/fs_append_test.c → testing/fs/cmocka/cases/fs_append_test.c b/...stsuites/kernel/fs/cases/fs_append_test.c → testing/fs/cmocka/cases/fs_append_test.c
diff --git a/...estsuites/kernel/fs/cases/fs_creat_test.c → testing/fs/cmocka/cases/fs_creat_test.c b/...estsuites/kernel/fs/cases/fs_creat_test.c → testing/fs/cmocka/cases/fs_creat_test.c
diff --git a/...testsuites/kernel/fs/cases/fs_dup2_test.c → testing/fs/cmocka/cases/fs_dup2_test.c b/...testsuites/kernel/fs/cases/fs_dup2_test.c → testing/fs/cmocka/cases/fs_dup2_test.c
diff --git a/.../testsuites/kernel/fs/cases/fs_dup_test.c → testing/fs/cmocka/cases/fs_dup_test.c b/.../testsuites/kernel/fs/cases/fs_dup_test.c → testing/fs/cmocka/cases/fs_dup_test.c
diff --git a/...tsuites/kernel/fs/cases/fs_eventfd_test.c → testing/fs/cmocka/cases/fs_eventfd_test.c b/...tsuites/kernel/fs/cases/fs_eventfd_test.c → testing/fs/cmocka/cases/fs_eventfd_test.c
diff --git a/...estsuites/kernel/fs/cases/fs_fcntl_test.c → testing/fs/cmocka/cases/fs_fcntl_test.c b/...estsuites/kernel/fs/cases/fs_fcntl_test.c → testing/fs/cmocka/cases/fs_fcntl_test.c
diff --git a/...estsuites/kernel/fs/cases/fs_fstat_test.c → testing/fs/cmocka/cases/fs_fstat_test.c b/...estsuites/kernel/fs/cases/fs_fstat_test.c → testing/fs/cmocka/cases/fs_fstat_test.c
diff --git a/...tsuites/kernel/fs/cases/fs_fstatfs_test.c → testing/fs/cmocka/cases/fs_fstatfs_test.c b/...tsuites/kernel/fs/cases/fs_fstatfs_test.c → testing/fs/cmocka/cases/fs_fstatfs_test.c
diff --git a/...estsuites/kernel/fs/cases/fs_fsync_test.c → testing/fs/cmocka/cases/fs_fsync_test.c b/...estsuites/kernel/fs/cases/fs_fsync_test.c → testing/fs/cmocka/cases/fs_fsync_test.c
diff --git a/...suites/kernel/fs/cases/fs_getfilep_test.c → testing/fs/cmocka/cases/fs_getfilep_test.c b/...suites/kernel/fs/cases/fs_getfilep_test.c → testing/fs/cmocka/cases/fs_getfilep_test.c
diff --git a/...estsuites/kernel/fs/cases/fs_mkdir_test.c → testing/fs/cmocka/cases/fs_mkdir_test.c b/...estsuites/kernel/fs/cases/fs_mkdir_test.c → testing/fs/cmocka/cases/fs_mkdir_test.c
diff --git a/...testsuites/kernel/fs/cases/fs_open_test.c → testing/fs/cmocka/cases/fs_open_test.c b/...testsuites/kernel/fs/cases/fs_open_test.c → testing/fs/cmocka/cases/fs_open_test.c
diff --git a/...tsuites/kernel/fs/cases/fs_opendir_test.c → testing/fs/cmocka/cases/fs_opendir_test.c b/...tsuites/kernel/fs/cases/fs_opendir_test.c → testing/fs/cmocka/cases/fs_opendir_test.c
diff --git a/...testsuites/kernel/fs/cases/fs_poll_test.c → testing/fs/cmocka/cases/fs_poll_test.c b/...testsuites/kernel/fs/cases/fs_poll_test.c → testing/fs/cmocka/cases/fs_poll_test.c
diff --git a/...estsuites/kernel/fs/cases/fs_pread_test.c → testing/fs/cmocka/cases/fs_pread_test.c b/...estsuites/kernel/fs/cases/fs_pread_test.c → testing/fs/cmocka/cases/fs_pread_test.c
diff --git a/...stsuites/kernel/fs/cases/fs_pwrite_test.c → testing/fs/cmocka/cases/fs_pwrite_test.c b/...stsuites/kernel/fs/cases/fs_pwrite_test.c → testing/fs/cmocka/cases/fs_pwrite_test.c
diff --git a/...testsuites/kernel/fs/cases/fs_read_test.c → testing/fs/cmocka/cases/fs_read_test.c b/...testsuites/kernel/fs/cases/fs_read_test.c → testing/fs/cmocka/cases/fs_read_test.c
diff --git a/...tsuites/kernel/fs/cases/fs_readdir_test.c → testing/fs/cmocka/cases/fs_readdir_test.c b/...tsuites/kernel/fs/cases/fs_readdir_test.c → testing/fs/cmocka/cases/fs_readdir_test.c
diff --git a/...suites/kernel/fs/cases/fs_readlink_test.c → testing/fs/cmocka/cases/fs_readlink_test.c b/...suites/kernel/fs/cases/fs_readlink_test.c → testing/fs/cmocka/cases/fs_readlink_test.c
diff --git a/...stsuites/kernel/fs/cases/fs_rename_test.c → testing/fs/cmocka/cases/fs_rename_test.c b/...stsuites/kernel/fs/cases/fs_rename_test.c → testing/fs/cmocka/cases/fs_rename_test.c
diff --git a/...uites/kernel/fs/cases/fs_rewinddir_test.c → testing/fs/cmocka/cases/fs_rewinddir_test.c b/...uites/kernel/fs/cases/fs_rewinddir_test.c → testing/fs/cmocka/cases/fs_rewinddir_test.c
diff --git a/...estsuites/kernel/fs/cases/fs_rmdir_test.c → testing/fs/cmocka/cases/fs_rmdir_test.c b/...estsuites/kernel/fs/cases/fs_rmdir_test.c → testing/fs/cmocka/cases/fs_rmdir_test.c
diff --git a/...testsuites/kernel/fs/cases/fs_seek_test.c → testing/fs/cmocka/cases/fs_seek_test.c b/...testsuites/kernel/fs/cases/fs_seek_test.c → testing/fs/cmocka/cases/fs_seek_test.c
diff --git a/...suites/kernel/fs/cases/fs_sendfile_test.c → testing/fs/cmocka/cases/fs_sendfile_test.c b/...suites/kernel/fs/cases/fs_sendfile_test.c → testing/fs/cmocka/cases/fs_sendfile_test.c
diff --git a/...testsuites/kernel/fs/cases/fs_stat_test.c → testing/fs/cmocka/cases/fs_stat_test.c b/...testsuites/kernel/fs/cases/fs_stat_test.c → testing/fs/cmocka/cases/fs_stat_test.c
diff --git a/...stsuites/kernel/fs/cases/fs_statfs_test.c → testing/fs/cmocka/cases/fs_statfs_test.c b/...stsuites/kernel/fs/cases/fs_statfs_test.c → testing/fs/cmocka/cases/fs_statfs_test.c
diff --git a/...stsuites/kernel/fs/cases/fs_stream_test.c → testing/fs/cmocka/cases/fs_stream_test.c b/...stsuites/kernel/fs/cases/fs_stream_test.c → testing/fs/cmocka/cases/fs_stream_test.c
diff --git a/...tsuites/kernel/fs/cases/fs_symlink_test.c → testing/fs/cmocka/cases/fs_symlink_test.c b/...tsuites/kernel/fs/cases/fs_symlink_test.c → testing/fs/cmocka/cases/fs_symlink_test.c
diff --git a/...suites/kernel/fs/cases/fs_truncate_test.c → testing/fs/cmocka/cases/fs_truncate_test.c b/...suites/kernel/fs/cases/fs_truncate_test.c → testing/fs/cmocka/cases/fs_truncate_test.c
diff --git a/...stsuites/kernel/fs/cases/fs_unlink_test.c → testing/fs/cmocka/cases/fs_unlink_test.c b/...stsuites/kernel/fs/cases/fs_unlink_test.c → testing/fs/cmocka/cases/fs_unlink_test.c
diff --git a/...estsuites/kernel/fs/cases/fs_write_test.c → testing/fs/cmocka/cases/fs_write_test.c b/...estsuites/kernel/fs/cases/fs_write_test.c → testing/fs/cmocka/cases/fs_write_test.c
diff --git a/...ing/testsuites/kernel/fs/cmocka_fs_test.c → testing/fs/cmocka/cmocka_fs_test.c b/...ing/testsuites/kernel/fs/cmocka_fs_test.c → testing/fs/cmocka/cmocka_fs_test.c
diff --git a/...tsuites/kernel/fs/common/test_fs_common.c → testing/fs/cmocka/common/test_fs_common.c b/...tsuites/kernel/fs/common/test_fs_common.c → testing/fs/cmocka/common/test_fs_common.c
diff --git a/...on/test_fs_common.c.home.tengshuangshuang.ext1.NuttxSpace.nuttx-apps.testing.testsuites.o b/...on/test_fs_common.c.home.tengshuangshuang.ext1.NuttxSpace.nuttx-apps.testing.testsuites.o
diff --git a/.../test_fs_common.c.home.tengshuangshuang.ext1.NuttxSpace.nuttx-apps.testing.testsuites_1.o b/.../test_fs_common.c.home.tengshuangshuang.ext1.NuttxSpace.nuttx-apps.testing.testsuites_1.o
diff --git a/...ing/testsuites/kernel/fs/include/fstest.h → testing/fs/cmocka/include/fstest.h b/...ing/testsuites/kernel/fs/include/fstest.h → testing/fs/cmocka/include/fstest.h
diff --git a/testing/fdsantest/CMakeLists.txt → testing/fs/fdsantest/CMakeLists.txt b/testing/fdsantest/CMakeLists.txt → testing/fs/fdsantest/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ##############################################################################
-# apps/testing/fdsantest/CMakeLists.txt
+# apps/testing/fs/fdsantest/CMakeLists.txt
 #
 # SPDX-License-Identifier: Apache-2.0
 #

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

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

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

diff --git a/testing/fstest/fstest_main.c → testing/fs/fstest/fstest_main.c b/testing/fstest/fstest_main.c → testing/fs/fstest/fstest_main.c
diff --git a/testing/mtd_config_fs/CMakeLists.txt → testing/fs/mtd_config_fs/CMakeLists.txt b/testing/mtd_config_fs/CMakeLists.txt → testing/fs/mtd_config_fs/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ##############################################################################
-# apps/testing/mtd_config_fs/CMakeLists.txt
+# apps/testing/fs/mtd_config_fs/CMakeLists.txt
 #
 # SPDX-License-Identifier: Apache-2.0
 #

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

diff --git a/...g/mtd_config_fs/mtd_config_fs_test_main.c → ...s/mtd_config_fs/mtd_config_fs_test_main.c b/...g/mtd_config_fs/mtd_config_fs_test_main.c → ...s/mtd_config_fs/mtd_config_fs_test_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/mtd_config_fs/mtd_config_fs_test_main.c
+ * apps/testing/fs/mtd_config_fs/mtd_config_fs_test_main.c
  *
  * SPDX-License-Identifier: Apache-2.0
  *

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
diff --git a/testing/mm/cmocka/Kconfig b/testing/mm/cmocka/Kconfig
@@ -0,0 +1,26 @@
+config TESTS_TESTSUITES
+	tristate "vela test suite"
+	default n
+	depends on TESTING_CMOCKA
+	---help---
+		Enable testsuites for the vela
+
+if TESTS_TESTSUITES
+
+config TESTS_TESTSUITES_MOUNT_DIR
+	string "Mount directory for the testsuites"
+	default "/data"
+
+config TESTS_TESTSUITES_PRIORITY
+	int "Testsuites task priority"
+	default 99
+
+config TESTS_TESTSUITES_STACKSIZE
+	int "Testsuites stack size"
+	default 16384
+
+config CM_MM_TEST
+	bool "enbale MM test"
+	default n
+
+endif # TESTS_TESTSUITES