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 bdb0fcd71 apps/testing: move himem_test,mtetest and x86-64-ABI folders
to the new arhc folder
bdb0fcd71 is described below
commit bdb0fcd71bc1d1191a5b3692d5f3be3dc721c9eb
Author: tengshuangshuang <tengshuangshu...@xiaomi.com>
AuthorDate: Mon Jan 20 11:07:25 2025 +0800
apps/testing: move himem_test,mtetest and x86-64-ABI folders to the new
arhc folder
Signed-off-by: tengshuangshuang <tengshuangshu...@xiaomi.com>
---
testing/arch/.gitignore | 1 +
testing/{mtetest => arch}/CMakeLists.txt | 7 +++----
testing/{mtetest => arch}/Make.defs | 6 ++----
testing/{mtetest/Make.defs => arch/Makefile} | 8 ++++----
testing/{ => arch}/himem_test/Kconfig | 0
testing/{ => arch}/himem_test/LibIncludes.mk | 2 +-
testing/{ => arch}/himem_test/Make.defs | 4 ++--
testing/{ => arch}/himem_test/Makefile | 4 ++--
testing/{ => arch}/himem_test/himem_chardev_test.c | 2 +-
testing/{ => arch}/mtetest/CMakeLists.txt | 2 +-
testing/{ => arch}/mtetest/Kconfig | 0
testing/{ => arch}/mtetest/Make.defs | 4 ++--
testing/{ => arch}/mtetest/Makefile | 2 +-
testing/{ => arch}/mtetest/mtetest.c | 2 +-
testing/{ => arch}/x86-64-ABI/.gitignore | 0
...001-app-testing-Resolve-the-issue-of-compilation-failure.patch | 0
testing/{ => arch}/x86-64-ABI/Kconfig | 0
testing/{ => arch}/x86-64-ABI/Make.defs | 4 ++--
testing/{ => arch}/x86-64-ABI/Makefile | 2 +-
19 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/testing/arch/.gitignore b/testing/arch/.gitignore
new file mode 100644
index 000000000..9e1d2593e
--- /dev/null
+++ b/testing/arch/.gitignore
@@ -0,0 +1 @@
+/Kconfig
diff --git a/testing/mtetest/CMakeLists.txt b/testing/arch/CMakeLists.txt
similarity index 87%
copy from testing/mtetest/CMakeLists.txt
copy to testing/arch/CMakeLists.txt
index fed326f22..8aba6b9cc 100644
--- a/testing/mtetest/CMakeLists.txt
+++ b/testing/arch/CMakeLists.txt
@@ -1,5 +1,5 @@
#
##############################################################################
-# apps/testing/mtetest/CMakeLists.txt
+# apps/testing/arch/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -20,6 +20,5 @@
#
#
##############################################################################
-if(CONFIG_TESTING_MTE)
- nuttx_add_application(NAME mtetest COMPILE_FLAGS ${CFLAGS} SRCS mtetest.c)
-endif()
+nuttx_add_subdirectory()
+nuttx_generate_kconfig(MENUDESC "arch")
diff --git a/testing/mtetest/Make.defs b/testing/arch/Make.defs
similarity index 89%
copy from testing/mtetest/Make.defs
copy to testing/arch/Make.defs
index 94339a5ce..07be33aec 100644
--- a/testing/mtetest/Make.defs
+++ b/testing/arch/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/mtetest/Make.defs
+# apps/testing/arch/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -20,6 +20,4 @@
#
############################################################################
-ifneq ($(CONFIG_TESTING_MTE),)
-CONFIGURED_APPS += $(APPDIR)/testing/mtetest
-endif
+include $(wildcard $(APPDIR)/testing/arch/*/Make.defs)
diff --git a/testing/mtetest/Make.defs b/testing/arch/Makefile
similarity index 89%
copy from testing/mtetest/Make.defs
copy to testing/arch/Makefile
index 94339a5ce..bbf6c4280 100644
--- a/testing/mtetest/Make.defs
+++ b/testing/arch/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/mtetest/Make.defs
+# apps/testing/arch/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -20,6 +20,6 @@
#
############################################################################
-ifneq ($(CONFIG_TESTING_MTE),)
-CONFIGURED_APPS += $(APPDIR)/testing/mtetest
-endif
+MENUDESC = "arch"
+
+include $(APPDIR)/Directory.mk
diff --git a/testing/himem_test/Kconfig b/testing/arch/himem_test/Kconfig
similarity index 100%
rename from testing/himem_test/Kconfig
rename to testing/arch/himem_test/Kconfig
diff --git a/testing/himem_test/LibIncludes.mk
b/testing/arch/himem_test/LibIncludes.mk
similarity index 96%
rename from testing/himem_test/LibIncludes.mk
rename to testing/arch/himem_test/LibIncludes.mk
index 3ad3e8ced..5f404389c 100644
--- a/testing/himem_test/LibIncludes.mk
+++ b/testing/arch/himem_test/LibIncludes.mk
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/himem_test/LibIncludes.mk
+# apps/testing/arch/himem_test/LibIncludes.mk
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/himem_test/Make.defs b/testing/arch/himem_test/Make.defs
similarity index 91%
rename from testing/himem_test/Make.defs
rename to testing/arch/himem_test/Make.defs
index 2e2b03d63..8a692df36 100644
--- a/testing/himem_test/Make.defs
+++ b/testing/arch/himem_test/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/himem_test/Make.defs
+# apps/testing/arch/himem_test/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -22,5 +22,5 @@
ifneq ($(CONFIG_TESTING_HIMEM_TEST),)
-CONFIGURED_APPS += $(APPDIR)/testing/himem_test
+CONFIGURED_APPS += $(APPDIR)/testing/arch/himem_test
endif
diff --git a/testing/himem_test/Makefile b/testing/arch/himem_test/Makefile
similarity index 93%
rename from testing/himem_test/Makefile
rename to testing/arch/himem_test/Makefile
index 76568df31..ae6ab8d83 100644
--- a/testing/himem_test/Makefile
+++ b/testing/arch/himem_test/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/himem_test/Makefile
+# apps/testing/arch/himem_test/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -22,7 +22,7 @@
include $(APPDIR)/Make.defs
-include $(APPDIR)/testing/himem_test/LibIncludes.mk
+include $(APPDIR)/testing/arch/himem_test/LibIncludes.mk
# built-in application info
diff --git a/testing/himem_test/himem_chardev_test.c
b/testing/arch/himem_test/himem_chardev_test.c
similarity index 99%
rename from testing/himem_test/himem_chardev_test.c
rename to testing/arch/himem_test/himem_chardev_test.c
index 118a9ca69..80c74e465 100644
--- a/testing/himem_test/himem_chardev_test.c
+++ b/testing/arch/himem_test/himem_chardev_test.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/himem_test/himem_chardev_test.c
+ * apps/testing/arch/himem_test/himem_chardev_test.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/mtetest/CMakeLists.txt
b/testing/arch/mtetest/CMakeLists.txt
similarity index 96%
rename from testing/mtetest/CMakeLists.txt
rename to testing/arch/mtetest/CMakeLists.txt
index fed326f22..33d20d913 100644
--- a/testing/mtetest/CMakeLists.txt
+++ b/testing/arch/mtetest/CMakeLists.txt
@@ -1,5 +1,5 @@
#
##############################################################################
-# apps/testing/mtetest/CMakeLists.txt
+# apps/testing/arch/mtetest/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/mtetest/Kconfig b/testing/arch/mtetest/Kconfig
similarity index 100%
rename from testing/mtetest/Kconfig
rename to testing/arch/mtetest/Kconfig
diff --git a/testing/mtetest/Make.defs b/testing/arch/mtetest/Make.defs
similarity index 92%
rename from testing/mtetest/Make.defs
rename to testing/arch/mtetest/Make.defs
index 94339a5ce..5e2717ee0 100644
--- a/testing/mtetest/Make.defs
+++ b/testing/arch/mtetest/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/mtetest/Make.defs
+# apps/testing/arch/mtetest/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -21,5 +21,5 @@
############################################################################
ifneq ($(CONFIG_TESTING_MTE),)
-CONFIGURED_APPS += $(APPDIR)/testing/mtetest
+CONFIGURED_APPS += $(APPDIR)/testing/arch/mtetest
endif
diff --git a/testing/mtetest/Makefile b/testing/arch/mtetest/Makefile
similarity index 96%
rename from testing/mtetest/Makefile
rename to testing/arch/mtetest/Makefile
index 73599309f..22693446b 100644
--- a/testing/mtetest/Makefile
+++ b/testing/arch/mtetest/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/mtetest/Makefile
+# apps/testing/arch/mtetest/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/mtetest/mtetest.c b/testing/arch/mtetest/mtetest.c
similarity index 99%
rename from testing/mtetest/mtetest.c
rename to testing/arch/mtetest/mtetest.c
index ac2f0bf1a..b6df5357d 100644
--- a/testing/mtetest/mtetest.c
+++ b/testing/arch/mtetest/mtetest.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/mtetest/mtetest.c
+ * apps/testing/arch/mtetest/mtetest.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/x86-64-ABI/.gitignore b/testing/arch/x86-64-ABI/.gitignore
similarity index 100%
rename from testing/x86-64-ABI/.gitignore
rename to testing/arch/x86-64-ABI/.gitignore
diff --git
a/testing/x86-64-ABI/0001-app-testing-Resolve-the-issue-of-compilation-failure.patch
b/testing/arch/x86-64-ABI/0001-app-testing-Resolve-the-issue-of-compilation-failure.patch
similarity index 100%
rename from
testing/x86-64-ABI/0001-app-testing-Resolve-the-issue-of-compilation-failure.patch
rename to
testing/arch/x86-64-ABI/0001-app-testing-Resolve-the-issue-of-compilation-failure.patch
diff --git a/testing/x86-64-ABI/Kconfig b/testing/arch/x86-64-ABI/Kconfig
similarity index 100%
rename from testing/x86-64-ABI/Kconfig
rename to testing/arch/x86-64-ABI/Kconfig
diff --git a/testing/x86-64-ABI/Make.defs b/testing/arch/x86-64-ABI/Make.defs
similarity index 91%
rename from testing/x86-64-ABI/Make.defs
rename to testing/arch/x86-64-ABI/Make.defs
index 4c5f32cdd..b37e54f95 100644
--- a/testing/x86-64-ABI/Make.defs
+++ b/testing/arch/x86-64-ABI/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# apps/system/uorb/Make.defs
+# apps/testing/arch/x86-64-ABI/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -21,5 +21,5 @@
############################################################################
ifneq ($(CONFIG_TESTING_X86_64_ABI),)
-CONFIGURED_APPS += $(APPDIR)/testing/x86-64-ABI
+CONFIGURED_APPS += $(APPDIR)/testing/arch/x86-64-ABI
endif
diff --git a/testing/x86-64-ABI/Makefile b/testing/arch/x86-64-ABI/Makefile
similarity index 98%
rename from testing/x86-64-ABI/Makefile
rename to testing/arch/x86-64-ABI/Makefile
index 927008f33..d5dea4abf 100644
--- a/testing/x86-64-ABI/Makefile
+++ b/testing/arch/x86-64-ABI/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/x86-64-ABI/Makefile
+# apps/testing/arch/x86-64-ABI/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
