This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git
The following commit(s) were added to refs/heads/master by this push:
new 8141e35f9 apps/testing:move epoll, fatutf8 ... folders to the new fs
folder
8141e35f9 is described below
commit 8141e35f99f97f806201cf558522245b9e595ca5
Author: tengshuangshuang <[email protected]>
AuthorDate: Tue Jan 21 17:50:45 2025 +0800
apps/testing:move epoll, fatutf8 ... folders to the new fs folder
Signed-off-by: tengshuangshuang <[email protected]>
---
testing/fs/.gitignore | 1 +
testing/{smart => fs}/CMakeLists.txt | 8 +++-----
testing/{nxffs => fs}/Make.defs | 6 ++----
testing/{nxffs/Make.defs => fs/Makefile} | 8 ++++----
testing/{ => fs}/epoll/CMakeLists.txt | 2 +-
testing/{ => fs}/epoll/Kconfig | 0
testing/{ => fs}/epoll/Make.defs | 4 ++--
testing/{ => fs}/epoll/Makefile | 2 +-
testing/{ => fs}/epoll/epoll.c | 2 +-
testing/{ => fs}/fatutf8/CMakeLists.txt | 2 +-
testing/{ => fs}/fatutf8/Kconfig | 0
testing/{ => fs}/fatutf8/Make.defs | 4 ++--
testing/{ => fs}/fatutf8/Makefile | 2 +-
testing/{ => fs}/fatutf8/fatutf8_main.c | 2 +-
testing/{ => fs}/fdsantest/CMakeLists.txt | 2 +-
testing/{ => fs}/fdsantest/Kconfig | 2 +-
testing/{ => fs}/fdsantest/Make.defs | 4 ++--
testing/{ => fs}/fdsantest/Makefile | 2 +-
testing/{ => fs}/fdsantest/fdsantest_simple.c | 2 +-
testing/{ => fs}/fopencookie/Kconfig | 0
testing/{ => fs}/fopencookie/Make.defs | 4 ++--
testing/{ => fs}/fopencookie/Makefile | 2 +-
testing/{ => fs}/fopencookie/fopencookie.c | 2 +-
testing/{ => fs}/fstest/CMakeLists.txt | 2 +-
testing/{ => fs}/fstest/Kconfig | 0
testing/{ => fs}/fstest/Make.defs | 4 ++--
testing/{ => fs}/fstest/Makefile | 2 +-
testing/{ => fs}/fstest/fstest_main.c | 2 +-
testing/{ => fs}/mtd_config_fs/CMakeLists.txt | 2 +-
testing/{ => fs}/mtd_config_fs/Kconfig | 0
testing/{ => fs}/mtd_config_fs/Make.defs | 4 ++--
testing/{ => fs}/mtd_config_fs/Makefile | 2 +-
testing/{ => fs}/mtd_config_fs/mtd_config_fs_test_main.c | 2 +-
testing/{ => fs}/nxffs/CMakeLists.txt | 2 +-
testing/{ => fs}/nxffs/Kconfig | 0
testing/{ => fs}/nxffs/Make.defs | 4 ++--
testing/{ => fs}/nxffs/Makefile | 2 +-
testing/{ => fs}/nxffs/nxffs_main.c | 2 +-
testing/{ => fs}/smart/CMakeLists.txt | 2 +-
testing/{ => fs}/smart/Kconfig | 0
testing/{ => fs}/smart/Make.defs | 4 ++--
testing/{ => fs}/smart/Makefile | 2 +-
testing/{ => fs}/smart/smart_main.c | 2 +-
testing/{ => fs}/smart_test/CMakeLists.txt | 2 +-
testing/{ => fs}/smart_test/Kconfig | 0
testing/{ => fs}/smart_test/Make.defs | 4 ++--
testing/{ => fs}/smart_test/Makefile | 2 +-
testing/{ => fs}/smart_test/smart_test.c | 2 +-
48 files changed, 55 insertions(+), 58 deletions(-)
diff --git a/testing/fs/.gitignore b/testing/fs/.gitignore
new file mode 100644
index 000000000..9e1d2593e
--- /dev/null
+++ b/testing/fs/.gitignore
@@ -0,0 +1 @@
+/Kconfig
diff --git a/testing/smart/CMakeLists.txt b/testing/fs/CMakeLists.txt
similarity index 84%
copy from testing/smart/CMakeLists.txt
copy to testing/fs/CMakeLists.txt
index 091f1fdf3..186ef20ef 100644
--- a/testing/smart/CMakeLists.txt
+++ b/testing/fs/CMakeLists.txt
@@ -1,5 +1,5 @@
#
##############################################################################
-# apps/testing/smart/CMakeLists.txt
+# apps/testing/fs/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -20,7 +20,5 @@
#
#
##############################################################################
-if(CONFIG_TESTING_SMART)
- nuttx_add_application(NAME smart MODULE ${CONFIG_TESTING_SMART} SRCS
- smart_main.c)
-endif()
+nuttx_add_subdirectory()
+nuttx_generate_kconfig(MENUDESC "fs")
diff --git a/testing/nxffs/Make.defs b/testing/fs/Make.defs
similarity index 89%
copy from testing/nxffs/Make.defs
copy to testing/fs/Make.defs
index 6fb1fd54e..fd956a026 100644
--- a/testing/nxffs/Make.defs
+++ b/testing/fs/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/nxffs/Make.defs
+# apps/testing/fs/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -20,6 +20,4 @@
#
############################################################################
-ifneq ($(CONFIG_TESTING_NXFFS),)
-CONFIGURED_APPS += $(APPDIR)/testing/nxffs
-endif
+include $(wildcard $(APPDIR)/testing/fs/*/Make.defs)
diff --git a/testing/nxffs/Make.defs b/testing/fs/Makefile
similarity index 89%
copy from testing/nxffs/Make.defs
copy to testing/fs/Makefile
index 6fb1fd54e..75783de89 100644
--- a/testing/nxffs/Make.defs
+++ b/testing/fs/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/nxffs/Make.defs
+# apps/testing/fs/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -20,6 +20,6 @@
#
############################################################################
-ifneq ($(CONFIG_TESTING_NXFFS),)
-CONFIGURED_APPS += $(APPDIR)/testing/nxffs
-endif
+MENUDESC = "fs"
+
+include $(APPDIR)/Directory.mk
diff --git a/testing/epoll/CMakeLists.txt b/testing/fs/epoll/CMakeLists.txt
similarity index 96%
rename from testing/epoll/CMakeLists.txt
rename to testing/fs/epoll/CMakeLists.txt
index 3839141e1..2428f3612 100644
--- a/testing/epoll/CMakeLists.txt
+++ b/testing/fs/epoll/CMakeLists.txt
@@ -1,5 +1,5 @@
#
##############################################################################
-# apps/testing/epoll/CMakeLists.txt
+# apps/testing/fs/epoll/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/epoll/Kconfig b/testing/fs/epoll/Kconfig
similarity index 100%
rename from testing/epoll/Kconfig
rename to testing/fs/epoll/Kconfig
diff --git a/testing/epoll/Make.defs b/testing/fs/epoll/Make.defs
similarity index 92%
rename from testing/epoll/Make.defs
rename to testing/fs/epoll/Make.defs
index fbabd4059..d9f822e36 100644
--- a/testing/epoll/Make.defs
+++ b/testing/fs/epoll/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/epoll/Make.defs
+# apps/testing/fs/epoll/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -21,5 +21,5 @@
############################################################################
ifneq ($(CONFIG_TESTING_EPOLL),)
-CONFIGURED_APPS += $(APPDIR)/testing/epoll
+CONFIGURED_APPS += $(APPDIR)/testing/fs/epoll
endif
diff --git a/testing/epoll/Makefile b/testing/fs/epoll/Makefile
similarity index 97%
rename from testing/epoll/Makefile
rename to testing/fs/epoll/Makefile
index 2a78ea7ac..a03158421 100644
--- a/testing/epoll/Makefile
+++ b/testing/fs/epoll/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/epoll/Makefile
+# apps/testing/fs/epoll/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/epoll/epoll.c b/testing/fs/epoll/epoll.c
similarity index 99%
rename from testing/epoll/epoll.c
rename to testing/fs/epoll/epoll.c
index 970a7ad4c..cd1d6cc0f 100644
--- a/testing/epoll/epoll.c
+++ b/testing/fs/epoll/epoll.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/epoll/epoll.c
+ * apps/testing/fs/epoll/epoll.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/fatutf8/CMakeLists.txt b/testing/fs/fatutf8/CMakeLists.txt
similarity index 96%
rename from testing/fatutf8/CMakeLists.txt
rename to testing/fs/fatutf8/CMakeLists.txt
index 276ae93a9..cc7a80322 100644
--- a/testing/fatutf8/CMakeLists.txt
+++ b/testing/fs/fatutf8/CMakeLists.txt
@@ -1,5 +1,5 @@
#
##############################################################################
-# apps/testing/fatutf8/CMakeLists.txt
+# apps/testing/fs/fatutf8/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/fatutf8/Kconfig b/testing/fs/fatutf8/Kconfig
similarity index 100%
rename from testing/fatutf8/Kconfig
rename to testing/fs/fatutf8/Kconfig
diff --git a/testing/fatutf8/Make.defs b/testing/fs/fatutf8/Make.defs
similarity index 92%
rename from testing/fatutf8/Make.defs
rename to testing/fs/fatutf8/Make.defs
index 2c62dc1fa..be545cf31 100644
--- a/testing/fatutf8/Make.defs
+++ b/testing/fs/fatutf8/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/fatutf8/Make.defs
+# apps/testing/fs/fatutf8/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -21,5 +21,5 @@
############################################################################
ifneq ($(CONFIG_TESTING_FATUTF8),)
-CONFIGURED_APPS += $(APPDIR)/testing/fatutf8
+CONFIGURED_APPS += $(APPDIR)/testing/fs/fatutf8
endif
diff --git a/testing/fatutf8/Makefile b/testing/fs/fatutf8/Makefile
similarity index 97%
rename from testing/fatutf8/Makefile
rename to testing/fs/fatutf8/Makefile
index e43198ec3..97064eedf 100644
--- a/testing/fatutf8/Makefile
+++ b/testing/fs/fatutf8/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/fatutf8/Makefile
+# apps/testing/fs/fatutf8/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/fatutf8/fatutf8_main.c b/testing/fs/fatutf8/fatutf8_main.c
similarity index 99%
rename from testing/fatutf8/fatutf8_main.c
rename to testing/fs/fatutf8/fatutf8_main.c
index 6975294e8..11a3daca4 100644
--- a/testing/fatutf8/fatutf8_main.c
+++ b/testing/fs/fatutf8/fatutf8_main.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/fatutf8/fatutf8_main.c
+ * apps/testing/fs/fatutf8/fatutf8_main.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/fdsantest/CMakeLists.txt
b/testing/fs/fdsantest/CMakeLists.txt
similarity index 96%
rename from testing/fdsantest/CMakeLists.txt
rename to testing/fs/fdsantest/CMakeLists.txt
index f6a5f7be1..f2da2d6ba 100644
--- a/testing/fdsantest/CMakeLists.txt
+++ b/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 b/testing/fs/fdsantest/Kconfig
similarity index 93%
rename from testing/fdsantest/Kconfig
rename to testing/fs/fdsantest/Kconfig
index 97d82510c..063f7092c 100644
--- a/testing/fdsantest/Kconfig
+++ b/testing/fs/fdsantest/Kconfig
@@ -4,7 +4,7 @@
#
config TESTING_FDSAN_TEST
- tristate "vela cmocka fdsan test"
+ tristate "Nuttx cmocka fdsan test"
default n
depends on TESTING_CMOCKA
---help---
diff --git a/testing/fdsantest/Make.defs b/testing/fs/fdsantest/Make.defs
similarity index 92%
rename from testing/fdsantest/Make.defs
rename to testing/fs/fdsantest/Make.defs
index 4be99c975..a6e03ba80 100644
--- a/testing/fdsantest/Make.defs
+++ b/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 b/testing/fs/fdsantest/Makefile
similarity index 97%
rename from testing/fdsantest/Makefile
rename to testing/fs/fdsantest/Makefile
index cddf85651..ee2df0850 100644
--- a/testing/fdsantest/Makefile
+++ b/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
b/testing/fs/fdsantest/fdsantest_simple.c
similarity index 98%
rename from testing/fdsantest/fdsantest_simple.c
rename to testing/fs/fdsantest/fdsantest_simple.c
index ab4068c7f..128e2878b 100644
--- a/testing/fdsantest/fdsantest_simple.c
+++ b/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/fopencookie/Kconfig b/testing/fs/fopencookie/Kconfig
similarity index 100%
rename from testing/fopencookie/Kconfig
rename to testing/fs/fopencookie/Kconfig
diff --git a/testing/fopencookie/Make.defs b/testing/fs/fopencookie/Make.defs
similarity index 91%
rename from testing/fopencookie/Make.defs
rename to testing/fs/fopencookie/Make.defs
index 778de83a9..70ab59fee 100644
--- a/testing/fopencookie/Make.defs
+++ b/testing/fs/fopencookie/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/fopencookie/Make.defs
+# apps/testing/fs/fopencookie/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -21,5 +21,5 @@
############################################################################
ifneq ($(CONFIG_TESTING_FOPENCOOKIE_TEST),)
-CONFIGURED_APPS += $(APPDIR)/testing/fopencookie
+CONFIGURED_APPS += $(APPDIR)/testing/fs/fopencookie
endif
diff --git a/testing/fopencookie/Makefile b/testing/fs/fopencookie/Makefile
similarity index 96%
rename from testing/fopencookie/Makefile
rename to testing/fs/fopencookie/Makefile
index 4af65d1f9..6ad0d6d93 100644
--- a/testing/fopencookie/Makefile
+++ b/testing/fs/fopencookie/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/fopencookie/Makefile
+# apps/testing/fs/fopencookie/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/fopencookie/fopencookie.c
b/testing/fs/fopencookie/fopencookie.c
similarity index 99%
rename from testing/fopencookie/fopencookie.c
rename to testing/fs/fopencookie/fopencookie.c
index 0c35a40da..02d943c26 100644
--- a/testing/fopencookie/fopencookie.c
+++ b/testing/fs/fopencookie/fopencookie.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/fopencookie/fopencookie.c
+ * apps/testing/fs/fopencookie/fopencookie.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/fstest/CMakeLists.txt b/testing/fs/fstest/CMakeLists.txt
similarity index 96%
rename from testing/fstest/CMakeLists.txt
rename to testing/fs/fstest/CMakeLists.txt
index 5b938a337..0228a8109 100644
--- a/testing/fstest/CMakeLists.txt
+++ b/testing/fs/fstest/CMakeLists.txt
@@ -1,5 +1,5 @@
#
##############################################################################
-# apps/testing/fstest/CMakeLists.txt
+# apps/testing/fs/fstest/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/fstest/Kconfig b/testing/fs/fstest/Kconfig
similarity index 100%
rename from testing/fstest/Kconfig
rename to testing/fs/fstest/Kconfig
diff --git a/testing/fstest/Make.defs b/testing/fs/fstest/Make.defs
similarity index 92%
rename from testing/fstest/Make.defs
rename to testing/fs/fstest/Make.defs
index 4545509e9..905a947d8 100644
--- a/testing/fstest/Make.defs
+++ b/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 b/testing/fs/fstest/Makefile
similarity index 97%
rename from testing/fstest/Makefile
rename to testing/fs/fstest/Makefile
index 4a845eb79..ab2cecd69 100644
--- a/testing/fstest/Makefile
+++ b/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 b/testing/fs/fstest/fstest_main.c
similarity index 99%
rename from testing/fstest/fstest_main.c
rename to testing/fs/fstest/fstest_main.c
index 0579dff36..68ea1f719 100644
--- a/testing/fstest/fstest_main.c
+++ b/testing/fs/fstest/fstest_main.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/fstest/fstest_main.c
+ * apps/testing/fs/fstest/fstest_main.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/mtd_config_fs/CMakeLists.txt
b/testing/fs/mtd_config_fs/CMakeLists.txt
similarity index 96%
rename from testing/mtd_config_fs/CMakeLists.txt
rename to testing/fs/mtd_config_fs/CMakeLists.txt
index 30056c35f..70201dca9 100644
--- a/testing/mtd_config_fs/CMakeLists.txt
+++ b/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 b/testing/fs/mtd_config_fs/Kconfig
similarity index 100%
rename from testing/mtd_config_fs/Kconfig
rename to testing/fs/mtd_config_fs/Kconfig
diff --git a/testing/mtd_config_fs/Make.defs
b/testing/fs/mtd_config_fs/Make.defs
similarity index 91%
rename from testing/mtd_config_fs/Make.defs
rename to testing/fs/mtd_config_fs/Make.defs
index 424b907fd..0c8bde14c 100644
--- a/testing/mtd_config_fs/Make.defs
+++ b/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 b/testing/fs/mtd_config_fs/Makefile
similarity index 97%
rename from testing/mtd_config_fs/Makefile
rename to testing/fs/mtd_config_fs/Makefile
index 601e42f61..c3ad88386 100644
--- a/testing/mtd_config_fs/Makefile
+++ b/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/testing/mtd_config_fs/mtd_config_fs_test_main.c
b/testing/fs/mtd_config_fs/mtd_config_fs_test_main.c
similarity index 99%
rename from testing/mtd_config_fs/mtd_config_fs_test_main.c
rename to testing/fs/mtd_config_fs/mtd_config_fs_test_main.c
index 5ebc2f990..5c44a6a1d 100644
--- a/testing/mtd_config_fs/mtd_config_fs_test_main.c
+++ b/testing/fs/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/nxffs/CMakeLists.txt b/testing/fs/nxffs/CMakeLists.txt
similarity index 96%
rename from testing/nxffs/CMakeLists.txt
rename to testing/fs/nxffs/CMakeLists.txt
index 493b2c29e..337c19e02 100644
--- a/testing/nxffs/CMakeLists.txt
+++ b/testing/fs/nxffs/CMakeLists.txt
@@ -1,5 +1,5 @@
#
##############################################################################
-# apps/testing/nxffs/CMakeLists.txt
+# apps/testing/fs/nxffs/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/nxffs/Kconfig b/testing/fs/nxffs/Kconfig
similarity index 100%
rename from testing/nxffs/Kconfig
rename to testing/fs/nxffs/Kconfig
diff --git a/testing/nxffs/Make.defs b/testing/fs/nxffs/Make.defs
similarity index 92%
rename from testing/nxffs/Make.defs
rename to testing/fs/nxffs/Make.defs
index 6fb1fd54e..89ae6c925 100644
--- a/testing/nxffs/Make.defs
+++ b/testing/fs/nxffs/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/nxffs/Make.defs
+# apps/testing/fs/nxffs/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -21,5 +21,5 @@
############################################################################
ifneq ($(CONFIG_TESTING_NXFFS),)
-CONFIGURED_APPS += $(APPDIR)/testing/nxffs
+CONFIGURED_APPS += $(APPDIR)/testing/fs/nxffs
endif
diff --git a/testing/nxffs/Makefile b/testing/fs/nxffs/Makefile
similarity index 97%
rename from testing/nxffs/Makefile
rename to testing/fs/nxffs/Makefile
index c03d5d05d..14a7cac6f 100644
--- a/testing/nxffs/Makefile
+++ b/testing/fs/nxffs/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/nxffs/Makefile
+# apps/testing/fs/nxffs/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/nxffs/nxffs_main.c b/testing/fs/nxffs/nxffs_main.c
similarity index 99%
rename from testing/nxffs/nxffs_main.c
rename to testing/fs/nxffs/nxffs_main.c
index 46f2fb2a5..25c15513a 100644
--- a/testing/nxffs/nxffs_main.c
+++ b/testing/fs/nxffs/nxffs_main.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/nxffs/nxffs_main.c
+ * apps/testing/fs/nxffs/nxffs_main.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/smart/CMakeLists.txt b/testing/fs/smart/CMakeLists.txt
similarity index 96%
rename from testing/smart/CMakeLists.txt
rename to testing/fs/smart/CMakeLists.txt
index 091f1fdf3..fc136b91e 100644
--- a/testing/smart/CMakeLists.txt
+++ b/testing/fs/smart/CMakeLists.txt
@@ -1,5 +1,5 @@
#
##############################################################################
-# apps/testing/smart/CMakeLists.txt
+# apps/testing/fs/smart/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/smart/Kconfig b/testing/fs/smart/Kconfig
similarity index 100%
rename from testing/smart/Kconfig
rename to testing/fs/smart/Kconfig
diff --git a/testing/smart/Make.defs b/testing/fs/smart/Make.defs
similarity index 92%
rename from testing/smart/Make.defs
rename to testing/fs/smart/Make.defs
index 771631a8b..099ab8f5c 100644
--- a/testing/smart/Make.defs
+++ b/testing/fs/smart/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/smart/Make.defs
+# apps/testing/fs/smart/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -21,5 +21,5 @@
############################################################################
ifneq ($(CONFIG_TESTING_SMART),)
-CONFIGURED_APPS += $(APPDIR)/testing/smart
+CONFIGURED_APPS += $(APPDIR)/testing/fs/smart
endif
diff --git a/testing/smart/Makefile b/testing/fs/smart/Makefile
similarity index 97%
rename from testing/smart/Makefile
rename to testing/fs/smart/Makefile
index deebbc535..9618f6a7a 100644
--- a/testing/smart/Makefile
+++ b/testing/fs/smart/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/smart/Makefile
+# apps/testing/fs/smart/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/smart/smart_main.c b/testing/fs/smart/smart_main.c
similarity index 99%
rename from testing/smart/smart_main.c
rename to testing/fs/smart/smart_main.c
index 03dd897bb..671f5b5cb 100644
--- a/testing/smart/smart_main.c
+++ b/testing/fs/smart/smart_main.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/smart/smart_main.c
+ * apps/testing/fs/smart/smart_main.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/smart_test/CMakeLists.txt
b/testing/fs/smart_test/CMakeLists.txt
similarity index 96%
rename from testing/smart_test/CMakeLists.txt
rename to testing/fs/smart_test/CMakeLists.txt
index 057e56282..a9a6a7280 100644
--- a/testing/smart_test/CMakeLists.txt
+++ b/testing/fs/smart_test/CMakeLists.txt
@@ -1,5 +1,5 @@
#
##############################################################################
-# apps/testing/smart_test/CMakeLists.txt
+# apps/testing/fs/smart_test/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/smart_test/Kconfig b/testing/fs/smart_test/Kconfig
similarity index 100%
rename from testing/smart_test/Kconfig
rename to testing/fs/smart_test/Kconfig
diff --git a/testing/smart_test/Make.defs b/testing/fs/smart_test/Make.defs
similarity index 91%
rename from testing/smart_test/Make.defs
rename to testing/fs/smart_test/Make.defs
index e02270134..4b866a3ac 100644
--- a/testing/smart_test/Make.defs
+++ b/testing/fs/smart_test/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/smart_test/Make.defs
+# apps/testing/fs/smart_test/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -21,5 +21,5 @@
############################################################################
ifneq ($(CONFIG_TESTING_SMART_TEST),)
-CONFIGURED_APPS += $(APPDIR)/testing/smart_test
+CONFIGURED_APPS += $(APPDIR)/testing/fs/smart_test
endif
diff --git a/testing/smart_test/Makefile b/testing/fs/smart_test/Makefile
similarity index 96%
rename from testing/smart_test/Makefile
rename to testing/fs/smart_test/Makefile
index 835a1751e..524c2b41d 100644
--- a/testing/smart_test/Makefile
+++ b/testing/fs/smart_test/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/smart_test/Makefile
+# apps/testing/fs/smart_test/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/smart_test/smart_test.c
b/testing/fs/smart_test/smart_test.c
similarity index 99%
rename from testing/smart_test/smart_test.c
rename to testing/fs/smart_test/smart_test.c
index 1650ba7ac..13bd393c8 100644
--- a/testing/smart_test/smart_test.c
+++ b/testing/fs/smart_test/smart_test.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/smart_test/smart_test.c
+ * apps/testing/fs/smart_test/smart_test.c
*
* SPDX-License-Identifier: Apache-2.0
*
