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 57c8a62e1 apps/testing:move arch_libc, fmemopen, scanftest folders to
the new lib folder
57c8a62e1 is described below
commit 57c8a62e1e7a5230f79bc460859940f063b72c25
Author: tengshuangshuang <tengshuangshu...@xiaomi.com>
AuthorDate: Wed Jan 22 09:19:43 2025 +0800
apps/testing:move arch_libc, fmemopen, scanftest folders to the new lib
folder
Signed-off-by: tengshuangshuang <tengshuangshu...@xiaomi.com>
---
testing/libc/.gitignore | 1 +
testing/{fmemopen => libc}/CMakeLists.txt | 15 +++------------
testing/{arch_libc => libc}/Make.defs | 6 ++----
testing/{arch_libc/Make.defs => libc/Makefile} | 8 ++++----
testing/{ => libc}/arch_libc/CMakeLists.txt | 2 +-
testing/{ => libc}/arch_libc/Kconfig | 0
testing/{ => libc}/arch_libc/Make.defs | 4 ++--
testing/{ => libc}/arch_libc/Makefile | 2 +-
testing/{ => libc}/arch_libc/arch_libc_test_main.c | 2 +-
testing/{ => libc}/fmemopen/CMakeLists.txt | 2 +-
testing/{ => libc}/fmemopen/Kconfig | 0
testing/{ => libc}/fmemopen/Make.defs | 4 ++--
testing/{ => libc}/fmemopen/Makefile | 2 +-
testing/{ => libc}/fmemopen/fmemopen.c | 2 +-
testing/{ => libc}/scanftest/CMakeLists.txt | 2 +-
testing/{ => libc}/scanftest/Kconfig | 0
testing/{ => libc}/scanftest/Make.defs | 4 ++--
testing/{ => libc}/scanftest/Makefile | 2 +-
testing/{ => libc}/scanftest/scanftest_main.c | 3 ++-
19 files changed, 26 insertions(+), 35 deletions(-)
diff --git a/testing/libc/.gitignore b/testing/libc/.gitignore
new file mode 100644
index 000000000..9e1d2593e
--- /dev/null
+++ b/testing/libc/.gitignore
@@ -0,0 +1 @@
+/Kconfig
diff --git a/testing/fmemopen/CMakeLists.txt b/testing/libc/CMakeLists.txt
similarity index 81%
copy from testing/fmemopen/CMakeLists.txt
copy to testing/libc/CMakeLists.txt
index 28f688dc1..fd0631c9b 100644
--- a/testing/fmemopen/CMakeLists.txt
+++ b/testing/libc/CMakeLists.txt
@@ -1,5 +1,5 @@
#
##############################################################################
-# apps/testing/fmemopen/CMakeLists.txt
+# apps/testing/libc/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -20,14 +20,5 @@
#
#
##############################################################################
-if(CONFIG_TESTING_FMEMOPEN_TEST)
- nuttx_add_application(
- NAME
- fmemopen_test
- STACKSIZE
- 4096
- MODULE
- ${CONFIG_TESTING_FMEMOPEN_TEST}
- SRCS
- fmemopen.c)
-endif()
+nuttx_add_subdirectory()
+nuttx_generate_kconfig(MENUDESC "libc")
diff --git a/testing/arch_libc/Make.defs b/testing/libc/Make.defs
similarity index 88%
copy from testing/arch_libc/Make.defs
copy to testing/libc/Make.defs
index 38c935ec2..b2f879258 100644
--- a/testing/arch_libc/Make.defs
+++ b/testing/libc/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/arch_libc/Make.defs
+# apps/testing/libc/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -20,6 +20,4 @@
#
############################################################################
-ifneq ($(CONFIG_TESTING_ARCH_LIBC),)
-CONFIGURED_APPS += $(APPDIR)/testing/arch_libc
-endif
+include $(wildcard $(APPDIR)/testing/libc/*/Make.defs)
diff --git a/testing/arch_libc/Make.defs b/testing/libc/Makefile
similarity index 88%
copy from testing/arch_libc/Make.defs
copy to testing/libc/Makefile
index 38c935ec2..ffea1e8c3 100644
--- a/testing/arch_libc/Make.defs
+++ b/testing/libc/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/arch_libc/Make.defs
+# apps/testing/libc/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -20,6 +20,6 @@
#
############################################################################
-ifneq ($(CONFIG_TESTING_ARCH_LIBC),)
-CONFIGURED_APPS += $(APPDIR)/testing/arch_libc
-endif
+MENUDESC = "libc"
+
+include $(APPDIR)/Directory.mk
diff --git a/testing/arch_libc/CMakeLists.txt
b/testing/libc/arch_libc/CMakeLists.txt
similarity index 96%
rename from testing/arch_libc/CMakeLists.txt
rename to testing/libc/arch_libc/CMakeLists.txt
index 38224f175..89e26e784 100644
--- a/testing/arch_libc/CMakeLists.txt
+++ b/testing/libc/arch_libc/CMakeLists.txt
@@ -1,5 +1,5 @@
#
##############################################################################
-# apps/testing/arch_libc/CMakeLists.txt
+# apps/testing/libc/arch_libc/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/arch_libc/Kconfig b/testing/libc/arch_libc/Kconfig
similarity index 100%
rename from testing/arch_libc/Kconfig
rename to testing/libc/arch_libc/Kconfig
diff --git a/testing/arch_libc/Make.defs b/testing/libc/arch_libc/Make.defs
similarity index 91%
rename from testing/arch_libc/Make.defs
rename to testing/libc/arch_libc/Make.defs
index 38c935ec2..5804fc130 100644
--- a/testing/arch_libc/Make.defs
+++ b/testing/libc/arch_libc/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/arch_libc/Make.defs
+# apps/testing/libc/arch_libc/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -21,5 +21,5 @@
############################################################################
ifneq ($(CONFIG_TESTING_ARCH_LIBC),)
-CONFIGURED_APPS += $(APPDIR)/testing/arch_libc
+CONFIGURED_APPS += $(APPDIR)/testing/libc/arch_libc
endif
diff --git a/testing/arch_libc/Makefile b/testing/libc/arch_libc/Makefile
similarity index 97%
rename from testing/arch_libc/Makefile
rename to testing/libc/arch_libc/Makefile
index ecd4f5434..610e10fa9 100644
--- a/testing/arch_libc/Makefile
+++ b/testing/libc/arch_libc/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/arch_libc/Makefile
+# apps/testing/libc/arch_libc/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/arch_libc/arch_libc_test_main.c
b/testing/libc/arch_libc/arch_libc_test_main.c
similarity index 99%
rename from testing/arch_libc/arch_libc_test_main.c
rename to testing/libc/arch_libc/arch_libc_test_main.c
index a053b7a1a..47cfe65bc 100644
--- a/testing/arch_libc/arch_libc_test_main.c
+++ b/testing/libc/arch_libc/arch_libc_test_main.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/arch_libc/arch_libc_test_main.c
+ * apps/testing/libc/arch_libc/arch_libc_test_main.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/fmemopen/CMakeLists.txt
b/testing/libc/fmemopen/CMakeLists.txt
similarity index 96%
rename from testing/fmemopen/CMakeLists.txt
rename to testing/libc/fmemopen/CMakeLists.txt
index 28f688dc1..b36d1c240 100644
--- a/testing/fmemopen/CMakeLists.txt
+++ b/testing/libc/fmemopen/CMakeLists.txt
@@ -1,5 +1,5 @@
#
##############################################################################
-# apps/testing/fmemopen/CMakeLists.txt
+# apps/testing/libc/fmemopen/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/fmemopen/Kconfig b/testing/libc/fmemopen/Kconfig
similarity index 100%
rename from testing/fmemopen/Kconfig
rename to testing/libc/fmemopen/Kconfig
diff --git a/testing/fmemopen/Make.defs b/testing/libc/fmemopen/Make.defs
similarity index 91%
rename from testing/fmemopen/Make.defs
rename to testing/libc/fmemopen/Make.defs
index 808223517..f96bb49c8 100644
--- a/testing/fmemopen/Make.defs
+++ b/testing/libc/fmemopen/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/fmemopen/Make.defs
+# apps/testing/libc/fmemopen/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -21,5 +21,5 @@
############################################################################
ifneq ($(CONFIG_TESTING_FMEMOPEN_TEST),)
-CONFIGURED_APPS += $(APPDIR)/testing/fmemopen
+CONFIGURED_APPS += $(APPDIR)/testing/libc/fmemopen
endif
diff --git a/testing/fmemopen/Makefile b/testing/libc/fmemopen/Makefile
similarity index 96%
rename from testing/fmemopen/Makefile
rename to testing/libc/fmemopen/Makefile
index e62c0c9ad..6bcfd61ab 100644
--- a/testing/fmemopen/Makefile
+++ b/testing/libc/fmemopen/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/fmemopen/Makefile
+# apps/testing/libc/fmemopen/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/fmemopen/fmemopen.c b/testing/libc/fmemopen/fmemopen.c
similarity index 99%
rename from testing/fmemopen/fmemopen.c
rename to testing/libc/fmemopen/fmemopen.c
index 06b396e03..101914f19 100644
--- a/testing/fmemopen/fmemopen.c
+++ b/testing/libc/fmemopen/fmemopen.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/fmemopen/fmemopen.c
+ * apps/testing/libc/fmemopen/fmemopen.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/scanftest/CMakeLists.txt
b/testing/libc/scanftest/CMakeLists.txt
similarity index 96%
rename from testing/scanftest/CMakeLists.txt
rename to testing/libc/scanftest/CMakeLists.txt
index dc6827bd0..a85e49011 100644
--- a/testing/scanftest/CMakeLists.txt
+++ b/testing/libc/scanftest/CMakeLists.txt
@@ -1,5 +1,5 @@
#
##############################################################################
-# apps/testing/scanftest/CMakeLists.txt
+# apps/testing/libc/scanftest/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/scanftest/Kconfig b/testing/libc/scanftest/Kconfig
similarity index 100%
rename from testing/scanftest/Kconfig
rename to testing/libc/scanftest/Kconfig
diff --git a/testing/scanftest/Make.defs b/testing/libc/scanftest/Make.defs
similarity index 91%
rename from testing/scanftest/Make.defs
rename to testing/libc/scanftest/Make.defs
index ebeffd590..bac5c96f5 100644
--- a/testing/scanftest/Make.defs
+++ b/testing/libc/scanftest/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/scanftest/Make.defs
+# apps/testing/libc/scanftest/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -21,5 +21,5 @@
############################################################################
ifneq ($(CONFIG_TESTING_SCANFTEST),)
-CONFIGURED_APPS += $(APPDIR)/testing/scanftest
+CONFIGURED_APPS += $(APPDIR)/testing/libc/scanftest
endif
diff --git a/testing/scanftest/Makefile b/testing/libc/scanftest/Makefile
similarity index 97%
rename from testing/scanftest/Makefile
rename to testing/libc/scanftest/Makefile
index 155b32ae4..6052ffed6 100644
--- a/testing/scanftest/Makefile
+++ b/testing/libc/scanftest/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/scanftest/Makefile
+# apps/testing/libc/scanftest/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/scanftest/scanftest_main.c
b/testing/libc/scanftest/scanftest_main.c
similarity index 99%
rename from testing/scanftest/scanftest_main.c
rename to testing/libc/scanftest/scanftest_main.c
index 2ec1f420f..6334c3074 100644
--- a/testing/scanftest/scanftest_main.c
+++ b/testing/libc/scanftest/scanftest_main.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/scanftest/scanftest_main.c
+ * apps/testing/libc/scanftest/scanftest_main.c
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2005-01-26, Greg King (https://github.com/cc65)
@@ -55,6 +55,7 @@
*
* Modified: Johannes Schock
*/
+
/****************************************************************************
* Included Files
****************************************************************************/
