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 0406e6734 apps/testing:move atomic,cpuload,getprime,smp and
timerjitter folders to the new sched folder
0406e6734 is described below
commit 0406e6734a2478a4211a73b7c7d92875fe2b40aa
Author: tengshuangshuang <tengshuangshu...@xiaomi.com>
AuthorDate: Fri Jan 24 14:27:50 2025 +0800
apps/testing:move atomic,cpuload,getprime,smp and timerjitter folders to
the new sched folder
Signed-off-by: tengshuangshuang <tengshuangshu...@xiaomi.com>
---
{testing => system}/cpuload/CMakeLists.txt | 6 +++---
{testing => system}/cpuload/Kconfig | 2 +-
{testing => system}/cpuload/Make.defs | 6 +++---
{testing => system}/cpuload/Makefile | 4 ++--
{testing => system}/cpuload/cpuload_main.c | 2 +-
testing/{ => libc}/atomic/CMakeLists.txt | 2 +-
testing/{ => libc}/atomic/Kconfig | 0
testing/{ => libc}/atomic/Make.defs | 4 ++--
testing/{ => libc}/atomic/Makefile | 2 +-
testing/{ => libc}/atomic/atomic_main.c | 2 +-
testing/sched/.gitignore | 1 +
testing/{smp => sched}/CMakeLists.txt | 15 +++------------
testing/{smp => sched}/Make.defs | 6 ++----
testing/{smp/Make.defs => sched/Makefile} | 8 ++++----
testing/{ => sched}/getprime/CMakeLists.txt | 2 +-
testing/{ => sched}/getprime/Kconfig | 0
testing/{ => sched}/getprime/Make.defs | 4 ++--
testing/{ => sched}/getprime/Makefile | 2 +-
testing/{ => sched}/getprime/getprime_main.c | 2 +-
testing/{ => sched}/smp/CMakeLists.txt | 2 +-
testing/{ => sched}/smp/Kconfig | 0
testing/{ => sched}/smp/Make.defs | 4 ++--
testing/{ => sched}/smp/Makefile | 2 +-
testing/{ => sched}/smp/smp_main.c | 2 +-
testing/{ => sched}/timerjitter/CMakeLists.txt | 2 +-
testing/{ => sched}/timerjitter/Kconfig | 0
testing/{ => sched}/timerjitter/Make.defs | 4 ++--
testing/{ => sched}/timerjitter/Makefile | 2 +-
testing/{ => sched}/timerjitter/timerjitter.c | 2 +-
29 files changed, 40 insertions(+), 50 deletions(-)
diff --git a/testing/cpuload/CMakeLists.txt b/system/cpuload/CMakeLists.txt
similarity index 92%
rename from testing/cpuload/CMakeLists.txt
rename to system/cpuload/CMakeLists.txt
index 60d8e2e64..eb3d5a556 100644
--- a/testing/cpuload/CMakeLists.txt
+++ b/system/cpuload/CMakeLists.txt
@@ -1,5 +1,5 @@
#
##############################################################################
-# apps/testing/cpuload/CMakeLists.txt
+# apps/system/cpuload/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -20,7 +20,7 @@
#
#
##############################################################################
-if(CONFIG_TESTING_CPULOAD)
+if(CONFIG_SYSTEM_CPULOAD)
nuttx_add_application(
NAME
cpuload
@@ -29,7 +29,7 @@ if(CONFIG_TESTING_CPULOAD)
STACKSIZE
${CONFIG_DEFAULT_TASK_STACKSIZE}
MODULE
- ${CONFIG_TESTING_CPULOAD}
+ ${CONFIG_SYSTEM_CPULOAD}
SRCS
cpuload_main.c)
endif()
diff --git a/testing/cpuload/Kconfig b/system/cpuload/Kconfig
similarity index 88%
rename from testing/cpuload/Kconfig
rename to system/cpuload/Kconfig
index aab20e614..f0b895b43 100644
--- a/testing/cpuload/Kconfig
+++ b/system/cpuload/Kconfig
@@ -3,6 +3,6 @@
# see the file kconfig-language.txt in the NuttX tools repository.
#
-config TESTING_CPULOAD
+config SYSTEM_CPULOAD
tristate "cpuload test"
default n
diff --git a/testing/cpuload/Make.defs b/system/cpuload/Make.defs
similarity index 89%
rename from testing/cpuload/Make.defs
rename to system/cpuload/Make.defs
index c43feb479..e73223175 100644
--- a/testing/cpuload/Make.defs
+++ b/system/cpuload/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/cpuload/Make.defs
+# apps/system/cpuload/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -20,6 +20,6 @@
#
############################################################################
-ifneq ($(CONFIG_TESTING_CPULOAD),)
-CONFIGURED_APPS += $(APPDIR)/testing/cpuload
+ifneq ($(CONFIG_SYSTEM_CPULOAD),)
+CONFIGURED_APPS += $(APPDIR)/testing/sched/cpuload
endif
diff --git a/testing/cpuload/Makefile b/system/cpuload/Makefile
similarity index 94%
rename from testing/cpuload/Makefile
rename to system/cpuload/Makefile
index 45fcb82c2..5d7058e1c 100644
--- a/testing/cpuload/Makefile
+++ b/system/cpuload/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/cpuload/Makefile
+# apps/system/cpuload/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -25,7 +25,7 @@ include $(APPDIR)/Make.defs
PROGNAME = cpuload
PRIORITY = 253
STACKSIZE = $(CONFIG_DEFAULT_TASK_STACKSIZE)
-MODULE = $(CONFIG_TESTING_CPULOAD)
+MODULE = $(CONFIG_SYSTEM_CPULOAD)
MAINSRC = cpuload_main.c
diff --git a/testing/cpuload/cpuload_main.c b/system/cpuload/cpuload_main.c
similarity index 98%
rename from testing/cpuload/cpuload_main.c
rename to system/cpuload/cpuload_main.c
index daa56dd85..25d5f549b 100644
--- a/testing/cpuload/cpuload_main.c
+++ b/system/cpuload/cpuload_main.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/cpuload/cpuload_main.c
+ * apps/system/cpuload/cpuload_main.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/atomic/CMakeLists.txt b/testing/libc/atomic/CMakeLists.txt
similarity index 96%
rename from testing/atomic/CMakeLists.txt
rename to testing/libc/atomic/CMakeLists.txt
index 5ae8d006b..e63ad4bc8 100644
--- a/testing/atomic/CMakeLists.txt
+++ b/testing/libc/atomic/CMakeLists.txt
@@ -1,5 +1,5 @@
#
##############################################################################
-# apps/testing/atomic/CMakeLists.txt
+# apps/testing/libc/atomic/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/atomic/Kconfig b/testing/libc/atomic/Kconfig
similarity index 100%
rename from testing/atomic/Kconfig
rename to testing/libc/atomic/Kconfig
diff --git a/testing/atomic/Make.defs b/testing/libc/atomic/Make.defs
similarity index 92%
rename from testing/atomic/Make.defs
rename to testing/libc/atomic/Make.defs
index be5f4eb46..ab66bcb19 100644
--- a/testing/atomic/Make.defs
+++ b/testing/libc/atomic/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/atomic/Make.defs
+# apps/testing/libc/atomic/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -21,5 +21,5 @@
############################################################################
ifneq ($(CONFIG_TESTING_ATOMIC),)
-CONFIGURED_APPS += $(APPDIR)/testing/atomic
+CONFIGURED_APPS += $(APPDIR)/testing/sched/atomic
endif
diff --git a/testing/atomic/Makefile b/testing/libc/atomic/Makefile
similarity index 97%
rename from testing/atomic/Makefile
rename to testing/libc/atomic/Makefile
index 19f4d48a3..2219ec39c 100644
--- a/testing/atomic/Makefile
+++ b/testing/libc/atomic/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/atomic/Makefile
+# apps/testing/libc/atomic/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/atomic/atomic_main.c b/testing/libc/atomic/atomic_main.c
similarity index 99%
rename from testing/atomic/atomic_main.c
rename to testing/libc/atomic/atomic_main.c
index 7d3985fd9..2ab64bf9d 100644
--- a/testing/atomic/atomic_main.c
+++ b/testing/libc/atomic/atomic_main.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/atomic/atomic_main.c
+ * apps/testing/libc/atomic/atomic_main.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/sched/.gitignore b/testing/sched/.gitignore
new file mode 100644
index 000000000..9e1d2593e
--- /dev/null
+++ b/testing/sched/.gitignore
@@ -0,0 +1 @@
+/Kconfig
diff --git a/testing/smp/CMakeLists.txt b/testing/sched/CMakeLists.txt
similarity index 79%
copy from testing/smp/CMakeLists.txt
copy to testing/sched/CMakeLists.txt
index ada0bceb1..08657891b 100644
--- a/testing/smp/CMakeLists.txt
+++ b/testing/sched/CMakeLists.txt
@@ -1,5 +1,5 @@
#
##############################################################################
-# apps/testing/smp/CMakeLists.txt
+# apps/testing/sched/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -20,14 +20,5 @@
#
#
##############################################################################
-if(CONFIG_TESTING_SMP)
- nuttx_add_application(
- NAME
- ${CONFIG_TESTING_SMP_PROGNAME}
- SRCS
- smp_main.c
- STACKSIZE
- ${CONFIG_TESTING_SMP_STACKSIZE}
- PRIORITY
- ${CONFIG_TESTING_SMP_PRIORITY})
-endif()
+nuttx_add_subdirectory()
+nuttx_generate_kconfig(MENUDESC "sched")
diff --git a/testing/smp/Make.defs b/testing/sched/Make.defs
similarity index 90%
copy from testing/smp/Make.defs
copy to testing/sched/Make.defs
index 78a315d54..f557eb75d 100644
--- a/testing/smp/Make.defs
+++ b/testing/sched/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/smp/Make.defs
+# apps/testing/sched/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -20,6 +20,4 @@
#
############################################################################
-ifneq ($(CONFIG_TESTING_SMP),)
-CONFIGURED_APPS += $(APPDIR)/testing/smp
-endif
+include $(wildcard $(APPDIR)/testing/sched/*/Make.defs)
diff --git a/testing/smp/Make.defs b/testing/sched/Makefile
similarity index 90%
copy from testing/smp/Make.defs
copy to testing/sched/Makefile
index 78a315d54..0e8113b06 100644
--- a/testing/smp/Make.defs
+++ b/testing/sched/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/smp/Make.defs
+# apps/testing/sched/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -20,6 +20,6 @@
#
############################################################################
-ifneq ($(CONFIG_TESTING_SMP),)
-CONFIGURED_APPS += $(APPDIR)/testing/smp
-endif
+MENUDESC = "sched"
+
+include $(APPDIR)/Directory.mk
diff --git a/testing/getprime/CMakeLists.txt
b/testing/sched/getprime/CMakeLists.txt
similarity index 96%
rename from testing/getprime/CMakeLists.txt
rename to testing/sched/getprime/CMakeLists.txt
index 407ae9649..7cafff825 100644
--- a/testing/getprime/CMakeLists.txt
+++ b/testing/sched/getprime/CMakeLists.txt
@@ -1,5 +1,5 @@
#
##############################################################################
-# apps/testing/getprime/CMakeLists.txt
+# apps/testing/sched/getprime/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/getprime/Kconfig b/testing/sched/getprime/Kconfig
similarity index 100%
rename from testing/getprime/Kconfig
rename to testing/sched/getprime/Kconfig
diff --git a/testing/getprime/Make.defs b/testing/sched/getprime/Make.defs
similarity index 91%
rename from testing/getprime/Make.defs
rename to testing/sched/getprime/Make.defs
index d990dc0ba..7591f4bb1 100644
--- a/testing/getprime/Make.defs
+++ b/testing/sched/getprime/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/getprime/Make.defs
+# apps/testing/sched/getprime/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -21,5 +21,5 @@
############################################################################
ifneq ($(CONFIG_TESTING_GETPRIME),)
-CONFIGURED_APPS += $(APPDIR)/testing/getprime
+CONFIGURED_APPS += $(APPDIR)/testing/sched/getprime
endif
diff --git a/testing/getprime/Makefile b/testing/sched/getprime/Makefile
similarity index 97%
rename from testing/getprime/Makefile
rename to testing/sched/getprime/Makefile
index b7605743c..3a728b04d 100644
--- a/testing/getprime/Makefile
+++ b/testing/sched/getprime/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/getprime/Makefile
+# apps/testing/sched/getprime/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/getprime/getprime_main.c
b/testing/sched/getprime/getprime_main.c
similarity index 99%
rename from testing/getprime/getprime_main.c
rename to testing/sched/getprime/getprime_main.c
index 710f07dac..bee2509be 100644
--- a/testing/getprime/getprime_main.c
+++ b/testing/sched/getprime/getprime_main.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/getprime/getprime_main.c
+ * apps/testing/sched/getprime/getprime_main.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/smp/CMakeLists.txt b/testing/sched/smp/CMakeLists.txt
similarity index 96%
rename from testing/smp/CMakeLists.txt
rename to testing/sched/smp/CMakeLists.txt
index ada0bceb1..0848fc605 100644
--- a/testing/smp/CMakeLists.txt
+++ b/testing/sched/smp/CMakeLists.txt
@@ -1,5 +1,5 @@
#
##############################################################################
-# apps/testing/smp/CMakeLists.txt
+# apps/testing/sched/smp/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/smp/Kconfig b/testing/sched/smp/Kconfig
similarity index 100%
rename from testing/smp/Kconfig
rename to testing/sched/smp/Kconfig
diff --git a/testing/smp/Make.defs b/testing/sched/smp/Make.defs
similarity index 92%
rename from testing/smp/Make.defs
rename to testing/sched/smp/Make.defs
index 78a315d54..2f6d49e7a 100644
--- a/testing/smp/Make.defs
+++ b/testing/sched/smp/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/smp/Make.defs
+# apps/testing/sched/smp/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -21,5 +21,5 @@
############################################################################
ifneq ($(CONFIG_TESTING_SMP),)
-CONFIGURED_APPS += $(APPDIR)/testing/smp
+CONFIGURED_APPS += $(APPDIR)/testing/sched/smp
endif
diff --git a/testing/smp/Makefile b/testing/sched/smp/Makefile
similarity index 97%
rename from testing/smp/Makefile
rename to testing/sched/smp/Makefile
index dd36b1c38..e9287d0dd 100644
--- a/testing/smp/Makefile
+++ b/testing/sched/smp/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/smp/Makefile
+# apps/testing/sched/smp/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/smp/smp_main.c b/testing/sched/smp/smp_main.c
similarity index 99%
rename from testing/smp/smp_main.c
rename to testing/sched/smp/smp_main.c
index c5fedcb74..8c3b94e7e 100644
--- a/testing/smp/smp_main.c
+++ b/testing/sched/smp/smp_main.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/smp/smp_main.c
+ * apps/testing/sched/smp/smp_main.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/timerjitter/CMakeLists.txt
b/testing/sched/timerjitter/CMakeLists.txt
similarity index 96%
rename from testing/timerjitter/CMakeLists.txt
rename to testing/sched/timerjitter/CMakeLists.txt
index 41a369aa2..dc84086eb 100644
--- a/testing/timerjitter/CMakeLists.txt
+++ b/testing/sched/timerjitter/CMakeLists.txt
@@ -1,5 +1,5 @@
#
##############################################################################
-# apps/testing/timerjitter/CMakeLists.txt
+# apps/testing/sched/timerjitter/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/timerjitter/Kconfig b/testing/sched/timerjitter/Kconfig
similarity index 100%
rename from testing/timerjitter/Kconfig
rename to testing/sched/timerjitter/Kconfig
diff --git a/testing/timerjitter/Make.defs b/testing/sched/timerjitter/Make.defs
similarity index 91%
rename from testing/timerjitter/Make.defs
rename to testing/sched/timerjitter/Make.defs
index f5ee53518..a27647e4d 100644
--- a/testing/timerjitter/Make.defs
+++ b/testing/sched/timerjitter/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/timerjitter/Make.defs
+# apps/testing/sched/timerjitter/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -21,5 +21,5 @@
############################################################################
ifneq ($(CONFIG_TESTING_TIMERJITTER),)
-CONFIGURED_APPS += $(APPDIR)/testing/timerjitter
+CONFIGURED_APPS += $(APPDIR)/testing/sched/timerjitter
endif
diff --git a/testing/timerjitter/Makefile b/testing/sched/timerjitter/Makefile
similarity index 96%
rename from testing/timerjitter/Makefile
rename to testing/sched/timerjitter/Makefile
index 993f06fff..65052cabb 100644
--- a/testing/timerjitter/Makefile
+++ b/testing/sched/timerjitter/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/timerjitter/Makefile
+# apps/testing/sched/timerjitter/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/timerjitter/timerjitter.c
b/testing/sched/timerjitter/timerjitter.c
similarity index 99%
rename from testing/timerjitter/timerjitter.c
rename to testing/sched/timerjitter/timerjitter.c
index 3e3353391..ad956cd4c 100644
--- a/testing/timerjitter/timerjitter.c
+++ b/testing/sched/timerjitter/timerjitter.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/timerjitter/timerjitter.c
+ * apps/testing/sched/timerjitter/timerjitter.c
*
* SPDX-License-Identifier: Apache-2.0
*
