diff --git a/system/cachespeed/Kconfig b/testing/cachespeed/Kconfig similarity index 88% rename from system/cachespeed/Kconfig rename to testing/cachespeed/Kconfig index 0ff474c23..e8a9cf8d8 100644 --- a/system/cachespeed/Kconfig +++ b/testing/cachespeed/Kconfig @@ -3,27 +3,27 @@ # see the file kconfig-language.txt in the NuttX tools repository. # -config SYSTEM_CACHESPEED +config TESTING_CACHESPEED bool "CACHE Speed Test" depends on ARCH_ICACHE && ARCH_DCACHE default n ---help--- Enable a simple CACHE speed test. -if SYSTEM_CACHESPEED +if TESTING_CACHESPEED -config SYSTEM_CACHESPEED_PROGNAME +config TESTING_CACHESPEED_PROGNAME string "Program name" default "cachespeed" ---help--- This is the name of the program that will be used when the NSH ELF program is installed. -config SYSTEM_CACHESPEED_PRIORITY +config TESTING_CACHESPEED_PRIORITY int "CACHE speed test task priority" default 100 -config SYSTEM_CACHESPEED_STACKSIZE +config TESTING_CACHESPEED_STACKSIZE int "CACHE speed test stack size" default DEFAULT_TASK_STACKSIZE diff --git a/system/memstress/Make.defs b/testing/cachespeed/Make.defs similarity index 88% rename from system/memstress/Make.defs rename to testing/cachespeed/Make.defs index 0463fd55a..85e55491f 100644 --- a/system/memstress/Make.defs +++ b/testing/cachespeed/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/system/memstress/Make.defs +# apps/testing/cachespeed/Make.defs # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -18,6 +18,6 @@ # ############################################################################ -ifneq ($(CONFIG_SYSTEM_MEMORY_STRESS),) -CONFIGURED_APPS += $(APPDIR)/system/memstress +ifneq ($(CONFIG_TESTING_CACHESPEED),) +CONFIGURED_APPS += $(APPDIR)/testing/cachespeed endif diff --git a/system/cachespeed/Makefile b/testing/cachespeed/Makefile similarity index 83% rename from system/cachespeed/Makefile rename to testing/cachespeed/Makefile index a76c7e48f..b6224204e 100644 --- a/system/cachespeed/Makefile +++ b/testing/cachespeed/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/system/cachespeed/Makefile +# apps/testing/cachespeed/Makefile # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -26,10 +26,10 @@ ifneq ($(CONFIG_CACHESPEED_MONOTONIC_TIME),y) CFLAGS += -DCACHESPEED_PERFTIME endif -PROGNAME = $(CONFIG_SYSTEM_CACHESPEED_PROGNAME) -PRIORITY = $(CONFIG_SYSTEM_CACHESPEED_PRIORITY) -STACKSIZE = $(CONFIG_SYSTEM_CACHESPEED_STACKSIZE) -MODULE = $(CONFIG_SYSTEM_CACHESPEED) +PROGNAME = $(CONFIG_TESTING_CACHESPEED_PROGNAME) +PRIORITY = $(CONFIG_TESTING_CACHESPEED_PRIORITY) +STACKSIZE = $(CONFIG_TESTING_CACHESPEED_STACKSIZE) +MODULE = $(CONFIG_TESTING_CACHESPEED) MAINSRC = cachespeed_main.c diff --git a/system/cachespeed/cachespeed_main.c b/testing/cachespeed/cachespeed_main.c similarity index 99% rename from system/cachespeed/cachespeed_main.c rename to testing/cachespeed/cachespeed_main.c index 711a4af9d..87425cdc7 100644 --- a/system/cachespeed/cachespeed_main.c +++ b/testing/cachespeed/cachespeed_main.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/system/cachespeed/cachespeed_main.c + * apps/testing/cachespeed/cachespeed_main.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/system/memstress/Kconfig b/testing/memstress/Kconfig similarity index 74% rename from system/memstress/Kconfig rename to testing/memstress/Kconfig index b0e592425..6e3d0606a 100644 --- a/system/memstress/Kconfig +++ b/testing/memstress/Kconfig @@ -3,26 +3,26 @@ # see the file kconfig-language.txt in the NuttX tools repository. # -config SYSTEM_MEMORY_STRESS +config TESTING_MEMORY_STRESS tristate "memory stress test" default n ---help--- Enable a memory stress test. -if SYSTEM_MEMORY_STRESS +if TESTING_MEMORY_STRESS -config SYSTEM_MEMORY_STRESS_PROGNAME +config TESTING_MEMORY_STRESS_PROGNAME string "Program name" default "memstress" ---help--- This is the name of the program that will be used when the NSH ELF program is installed. -config SYSTEM_MEMORY_STRESS_PRIORITY +config TESTING_MEMORY_STRESS_PRIORITY int "MEMORY stress task priority" default 100 -config SYSTEM_MEMORY_STRESS_STACKSIZE +config TESTING_MEMORY_STRESS_STACKSIZE int "MEMORY stress stack size" default DEFAULT_TASK_STACKSIZE diff --git a/system/cachespeed/Make.defs b/testing/memstress/Make.defs similarity index 88% rename from system/cachespeed/Make.defs rename to testing/memstress/Make.defs index 3e4ca61d0..e2ac44a38 100644 --- a/system/cachespeed/Make.defs +++ b/testing/memstress/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/system/cachespeed/Make.defs +# apps/testing/memstress/Make.defs # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -18,6 +18,6 @@ # ############################################################################ -ifneq ($(CONFIG_SYSTEM_CACHESPEED),) -CONFIGURED_APPS += $(APPDIR)/system/cachespeed +ifneq ($(CONFIG_TESTING_MEMORY_STRESS),) +CONFIGURED_APPS += $(APPDIR)/testing/memstress endif diff --git a/system/memstress/Makefile b/testing/memstress/Makefile similarity index 81% rename from system/memstress/Makefile rename to testing/memstress/Makefile index 9e9f6a665..aa8e85c4b 100644 --- a/system/memstress/Makefile +++ b/testing/memstress/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/system/memstress/Makefile +# apps/testing/memstress/Makefile # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -22,10 +22,10 @@ include $(APPDIR)/Make.defs # RAM speed test -PROGNAME = $(CONFIG_SYSTEM_MEMORY_STRESS_PROGNAME) -PRIORITY = $(CONFIG_SYSTEM_MEMORY_STRESS_PRIORITY) -STACKSIZE = $(CONFIG_SYSTEM_MEMORY_STRESS_STACKSIZE) -MODULE = $(CONFIG_SYSTEM_MEMORY_STRESS) +PROGNAME = $(CONFIG_TESTING_MEMORY_STRESS_PROGNAME) +PRIORITY = $(CONFIG_TESTING_MEMORY_STRESS_PRIORITY) +STACKSIZE = $(CONFIG_TESTING_MEMORY_STRESS_STACKSIZE) +MODULE = $(CONFIG_TESTING_MEMORY_STRESS) MAINSRC = memorystress_main.c diff --git a/system/memstress/memorystress_main.c b/testing/memstress/memorystress_main.c similarity index 99% rename from system/memstress/memorystress_main.c rename to testing/memstress/memorystress_main.c index ec3d1911a..980c4aafb 100644 --- a/system/memstress/memorystress_main.c +++ b/testing/memstress/memorystress_main.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/system/memstress/memorystress_main.c + * apps/testing/memstress/memorystress_main.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/system/ramspeed/Kconfig b/testing/ramspeed/Kconfig similarity index 77% rename from system/ramspeed/Kconfig rename to testing/ramspeed/Kconfig index 25c0bd763..304629711 100644 --- a/system/ramspeed/Kconfig +++ b/testing/ramspeed/Kconfig @@ -3,26 +3,26 @@ # see the file kconfig-language.txt in the NuttX tools repository. # -config SYSTEM_RAMSPEED +config TESTING_RAMSPEED tristate "RAM Speed Test" default n ---help--- Enable a simple RAM speed test. -if SYSTEM_RAMSPEED +if TESTING_RAMSPEED -config SYSTEM_RAMSPEED_PROGNAME +config TESTING_RAMSPEED_PROGNAME string "Program name" default "ramspeed" ---help--- This is the name of the program that will be used when the NSH ELF program is installed. -config SYSTEM_RAMSPEED_PRIORITY +config TESTING_RAMSPEED_PRIORITY int "RAM speed test task priority" default 100 -config SYSTEM_RAMSPEED_STACKSIZE +config TESTING_RAMSPEED_STACKSIZE int "RAM speed test stack size" default DEFAULT_TASK_STACKSIZE diff --git a/system/ramtest/Make.defs b/testing/ramspeed/Make.defs similarity index 89% rename from system/ramtest/Make.defs rename to testing/ramspeed/Make.defs index a32def632..24b6c633a 100644 --- a/system/ramtest/Make.defs +++ b/testing/ramspeed/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/system/ramtest/Make.defs +# apps/testing/ramspeed/Make.defs # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -18,6 +18,6 @@ # ############################################################################ -ifneq ($(CONFIG_SYSTEM_RAMTEST),) -CONFIGURED_APPS += $(APPDIR)/system/ramtest +ifneq ($(CONFIG_TESTING_RAMSPEED),) +CONFIGURED_APPS += $(APPDIR)/testing/ramspeed endif diff --git a/system/ramspeed/Makefile b/testing/ramspeed/Makefile similarity index 83% rename from system/ramspeed/Makefile rename to testing/ramspeed/Makefile index f6aeb3bc1..926f4398b 100644 --- a/system/ramspeed/Makefile +++ b/testing/ramspeed/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/system/ramspeed/Makefile +# apps/testing/ramspeed/Makefile # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -22,10 +22,10 @@ include $(APPDIR)/Make.defs # RAM speed test -PROGNAME = $(CONFIG_SYSTEM_RAMSPEED_PROGNAME) -PRIORITY = $(CONFIG_SYSTEM_RAMSPEED_PRIORITY) -STACKSIZE = $(CONFIG_SYSTEM_RAMSPEED_STACKSIZE) -MODULE = $(CONFIG_SYSTEM_RAMSPEED) +PROGNAME = $(CONFIG_TESTING_RAMSPEED_PROGNAME) +PRIORITY = $(CONFIG_TESTING_RAMSPEED_PRIORITY) +STACKSIZE = $(CONFIG_TESTING_RAMSPEED_STACKSIZE) +MODULE = $(CONFIG_TESTING_RAMSPEED) MAINSRC = ramspeed_main.c diff --git a/system/ramspeed/ramspeed_main.c b/testing/ramspeed/ramspeed_main.c similarity index 99% rename from system/ramspeed/ramspeed_main.c rename to testing/ramspeed/ramspeed_main.c index 6e6520007..3cc50fdf8 100644 --- a/system/ramspeed/ramspeed_main.c +++ b/testing/ramspeed/ramspeed_main.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/system/ramspeed/ramspeed_main.c + * apps/testing/ramspeed/ramspeed_main.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/system/ramtest/CMakeLists.txt b/testing/ramtest/CMakeLists.txt similarity index 100% rename from system/ramtest/CMakeLists.txt rename to testing/ramtest/CMakeLists.txt diff --git a/system/ramtest/Kconfig b/testing/ramtest/Kconfig similarity index 77% rename from system/ramtest/Kconfig rename to testing/ramtest/Kconfig index 6faa15da1..4846e06cc 100644 --- a/system/ramtest/Kconfig +++ b/testing/ramtest/Kconfig @@ -3,26 +3,26 @@ # see the file kconfig-language.txt in the NuttX tools repository. # -config SYSTEM_RAMTEST +config TESTING_RAMTEST tristate "RAM Test" default n ---help--- Enable a simple RAM test. -if SYSTEM_RAMTEST +if TESTING_RAMTEST -config SYSTEM_RAMTEST_PROGNAME +config TESTING_RAMTEST_PROGNAME string "Program name" default "ramtest" ---help--- This is the name of the program that will be used when the NSH ELF program is installed. -config SYSTEM_RAMTEST_PRIORITY +config TESTING_RAMTEST_PRIORITY int "RAM test task priority" default 100 -config SYSTEM_RAMTEST_STACKSIZE +config TESTING_RAMTEST_STACKSIZE int "RAM test stack size" default DEFAULT_TASK_STACKSIZE diff --git a/system/ramspeed/Make.defs b/testing/ramtest/Make.defs similarity index 89% rename from system/ramspeed/Make.defs rename to testing/ramtest/Make.defs index 44361700e..ff4a47012 100644 --- a/system/ramspeed/Make.defs +++ b/testing/ramtest/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/system/ramspeed/Make.defs +# apps/testing/ramtest/Make.defs # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -18,6 +18,6 @@ # ############################################################################ -ifneq ($(CONFIG_SYSTEM_RAMSPEED),) -CONFIGURED_APPS += $(APPDIR)/system/ramspeed +ifneq ($(CONFIG_TESTING_RAMTEST),) +CONFIGURED_APPS += $(APPDIR)/testing/ramtest endif diff --git a/system/ramtest/Makefile b/testing/ramtest/Makefile similarity index 83% rename from system/ramtest/Makefile rename to testing/ramtest/Makefile index 23b56ecbc..89636f301 100644 --- a/system/ramtest/Makefile +++ b/testing/ramtest/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/system/ramtest/Makefile +# apps/testing/ramtest/Makefile # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -22,10 +22,10 @@ include $(APPDIR)/Make.defs # RAM test -PROGNAME = $(CONFIG_SYSTEM_RAMTEST_PROGNAME) -PRIORITY = $(CONFIG_SYSTEM_RAMTEST_PRIORITY) -STACKSIZE = $(CONFIG_SYSTEM_RAMTEST_STACKSIZE) -MODULE = $(CONFIG_SYSTEM_RAMTEST) +PROGNAME = $(CONFIG_TESTING_RAMTEST_PROGNAME) +PRIORITY = $(CONFIG_TESTING_RAMTEST_PRIORITY) +STACKSIZE = $(CONFIG_TESTING_RAMTEST_STACKSIZE) +MODULE = $(CONFIG_TESTING_RAMTEST) MAINSRC = ramtest.c diff --git a/system/ramtest/ramtest.c b/testing/ramtest/ramtest.c similarity index 99% rename from system/ramtest/ramtest.c rename to testing/ramtest/ramtest.c index 28ddda378..0962e512e 100644 --- a/system/ramtest/ramtest.c +++ b/testing/ramtest/ramtest.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/system/ramtest/ramtest.c + * apps/testing/ramtest/ramtest.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -38,7 +38,7 @@ #include -#ifdef CONFIG_SYSTEM_RAMTEST +#ifdef CONFIG_TESTING_RAMTEST /**************************************************************************** * Pre-processor Definitions @@ -591,4 +591,4 @@ int main(int argc, FAR char *argv[]) return 0; } -#endif /* CONFIG_SYSTEM_RAMTEST */ +#endif /* CONFIG_TESTING_RAMTEST */