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 6bc2b3c93 apps/testing:move {drivertest fftest irtest monkey nand_sim
pcitest sd_bench sd_stress sensortest} folders to the new driver folder
6bc2b3c93 is described below
commit 6bc2b3c933141e02c87c68f304a915db011b8408
Author: tengshuangshuang <[email protected]>
AuthorDate: Tue Jan 21 09:18:45 2025 +0800
apps/testing:move {drivertest fftest irtest monkey nand_sim pcitest
sd_bench sd_stress sensortest} folders to the new driver folder
Signed-off-by: tengshuangshuang <[email protected]>
---
testing/drivers/.gitignore | 1 +
testing/{nand_sim => drivers}/CMakeLists.txt | 15 +++------------
testing/{fftest => drivers}/Make.defs | 6 ++----
testing/{fftest/Make.defs => drivers/Makefile} | 8 ++++----
testing/{ => drivers}/drivertest/CMakeLists.txt | 2 +-
testing/{ => drivers}/drivertest/Kconfig | 0
testing/{ => drivers}/drivertest/Make.defs | 4 ++--
testing/{ => drivers}/drivertest/Makefile | 2 +-
testing/{ => drivers}/drivertest/drivertest_adc.c | 2 +-
testing/{ => drivers}/drivertest/drivertest_audio.c | 2 +-
testing/{ => drivers}/drivertest/drivertest_block.c | 2 +-
testing/{ => drivers}/drivertest/drivertest_framebuffer.c | 2 +-
testing/{ => drivers}/drivertest/drivertest_gpio.c | 2 +-
testing/{ => drivers}/drivertest/drivertest_i2c_read.c | 2 +-
testing/{ => drivers}/drivertest/drivertest_i2c_spi.c | 2 +-
testing/{ => drivers}/drivertest/drivertest_i2c_write.c | 2 +-
testing/{ => drivers}/drivertest/drivertest_lcd.c | 2 +-
testing/{ => drivers}/drivertest/drivertest_mps2.c | 2 +-
.../{ => drivers}/drivertest/drivertest_mps2_isr_signal.c | 2 +-
.../drivertest/drivertest_mps2_zerointerrupt.c | 2 +-
testing/{ => drivers}/drivertest/drivertest_oneshot.c | 2 +-
testing/{ => drivers}/drivertest/drivertest_pm.c | 2 +-
testing/{ => drivers}/drivertest/drivertest_pm_runtime.c | 2 +-
testing/{ => drivers}/drivertest/drivertest_pm_smp.c | 2 +-
testing/{ => drivers}/drivertest/drivertest_posix_timer.c | 2 +-
testing/{ => drivers}/drivertest/drivertest_pwm.c | 2 +-
testing/{ => drivers}/drivertest/drivertest_regulator.c | 2 +-
testing/{ => drivers}/drivertest/drivertest_relay.c | 2 +-
testing/{ => drivers}/drivertest/drivertest_rtc.c | 2 +-
testing/{ => drivers}/drivertest/drivertest_simple.c | 2 +-
testing/{ => drivers}/drivertest/drivertest_timer.c | 2 +-
testing/{ => drivers}/drivertest/drivertest_touchpanel.c | 2 +-
testing/{ => drivers}/drivertest/drivertest_uart.c | 2 +-
testing/{ => drivers}/drivertest/drivertest_watchdog.c | 2 +-
testing/{ => drivers}/drivertest/test_content_gen.py | 2 +-
testing/{ => drivers}/fftest/CMakeLists.txt | 2 +-
testing/{ => drivers}/fftest/Kconfig | 0
testing/{ => drivers}/fftest/Make.defs | 4 ++--
testing/{ => drivers}/fftest/Makefile | 2 +-
testing/{ => drivers}/fftest/fftest.c | 2 +-
testing/{ => drivers}/nand_sim/CMakeLists.txt | 2 +-
testing/{ => drivers}/nand_sim/Kconfig | 0
testing/{ => drivers}/nand_sim/Make.defs | 4 ++--
testing/{ => drivers}/nand_sim/Makefile | 2 +-
testing/{ => drivers}/nand_sim/nand_sim_main.c | 2 +-
testing/{ => drivers}/pcitest/Kconfig | 0
testing/{ => drivers}/pcitest/Make.defs | 4 ++--
testing/{ => drivers}/pcitest/Makefile | 2 +-
testing/{ => drivers}/pcitest/pcitest.c | 2 +-
testing/{ => drivers}/sd_stress/Kconfig | 0
testing/{ => drivers}/sd_stress/Make.defs | 4 ++--
testing/{ => drivers}/sd_stress/Makefile | 2 +-
testing/{ => drivers}/sd_stress/sd_stress_main.c | 6 +++---
53 files changed, 61 insertions(+), 71 deletions(-)
diff --git a/testing/drivers/.gitignore b/testing/drivers/.gitignore
new file mode 100644
index 000000000..9e1d2593e
--- /dev/null
+++ b/testing/drivers/.gitignore
@@ -0,0 +1 @@
+/Kconfig
diff --git a/testing/nand_sim/CMakeLists.txt b/testing/drivers/CMakeLists.txt
similarity index 80%
copy from testing/nand_sim/CMakeLists.txt
copy to testing/drivers/CMakeLists.txt
index 4f9b4021c..e796e074a 100644
--- a/testing/nand_sim/CMakeLists.txt
+++ b/testing/drivers/CMakeLists.txt
@@ -1,5 +1,5 @@
#
##############################################################################
-# apps/testing/nand_sim/CMakeLists.txt
+# apps/testing/drivers/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -20,14 +20,5 @@
#
#
##############################################################################
-if(CONFIG_TESTING_NAND_SIM)
- nuttx_add_application(
- NAME
- nand
- STACKSIZE
- ${CONFIG_TESTING_NAND_SIM_STACK}
- MODULE
- ${CONFIG_TESTING_NAND_SIM}
- SRCS
- nand_sim_main.c)
-endif()
+nuttx_add_subdirectory()
+nuttx_generate_kconfig(MENUDESC "drivers")
diff --git a/testing/fftest/Make.defs b/testing/drivers/Make.defs
similarity index 89%
copy from testing/fftest/Make.defs
copy to testing/drivers/Make.defs
index 0190fb4f2..4da871439 100644
--- a/testing/fftest/Make.defs
+++ b/testing/drivers/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/fftest/Make.defs
+# apps/testing/drivers/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -20,6 +20,4 @@
#
############################################################################
-ifneq ($(CONFIG_TESTING_FF),)
-CONFIGURED_APPS += $(APPDIR)/testing/fftest
-endif
+include $(wildcard $(APPDIR)/testing/drivers/*/Make.defs)
diff --git a/testing/fftest/Make.defs b/testing/drivers/Makefile
similarity index 89%
copy from testing/fftest/Make.defs
copy to testing/drivers/Makefile
index 0190fb4f2..a0da405f4 100644
--- a/testing/fftest/Make.defs
+++ b/testing/drivers/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/fftest/Make.defs
+# apps/testing/drivers/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -20,6 +20,6 @@
#
############################################################################
-ifneq ($(CONFIG_TESTING_FF),)
-CONFIGURED_APPS += $(APPDIR)/testing/fftest
-endif
+MENUDESC = "dirvers"
+
+include $(APPDIR)/Directory.mk
diff --git a/testing/drivertest/CMakeLists.txt
b/testing/drivers/drivertest/CMakeLists.txt
similarity index 99%
rename from testing/drivertest/CMakeLists.txt
rename to testing/drivers/drivertest/CMakeLists.txt
index a3add4dca..249284230 100644
--- a/testing/drivertest/CMakeLists.txt
+++ b/testing/drivers/drivertest/CMakeLists.txt
@@ -1,5 +1,5 @@
#
##############################################################################
-# apps/testing/drivertest/CMakeLists.txt
+# apps/testing/drivers/drivertest/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/drivertest/Kconfig b/testing/drivers/drivertest/Kconfig
similarity index 100%
rename from testing/drivertest/Kconfig
rename to testing/drivers/drivertest/Kconfig
diff --git a/testing/drivertest/Make.defs b/testing/drivers/drivertest/Make.defs
similarity index 91%
rename from testing/drivertest/Make.defs
rename to testing/drivers/drivertest/Make.defs
index a68b7e050..5e6a00534 100644
--- a/testing/drivertest/Make.defs
+++ b/testing/drivers/drivertest/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/drivertest/Make.defs
+# apps/testing/drivers/drivertest/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -21,5 +21,5 @@
############################################################################
ifneq ($(CONFIG_TESTING_DRIVER_TEST),)
-CONFIGURED_APPS += $(APPDIR)/testing/drivertest
+CONFIGURED_APPS += $(APPDIR)/testing/drivers/drivertest
endif
diff --git a/testing/drivertest/Makefile b/testing/drivers/drivertest/Makefile
similarity index 98%
rename from testing/drivertest/Makefile
rename to testing/drivers/drivertest/Makefile
index aa25dfa83..470c91512 100644
--- a/testing/drivertest/Makefile
+++ b/testing/drivers/drivertest/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/drivertest/Makefile
+# apps/testing/drivers/drivertest/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/drivertest/drivertest_adc.c
b/testing/drivers/drivertest/drivertest_adc.c
similarity index 99%
rename from testing/drivertest/drivertest_adc.c
rename to testing/drivers/drivertest/drivertest_adc.c
index 267ed770a..d9360b379 100644
--- a/testing/drivertest/drivertest_adc.c
+++ b/testing/drivers/drivertest/drivertest_adc.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/drivertest/drivertest_adc.c
+ * apps/testing/drivers/drivertest/drivertest_adc.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/drivertest/drivertest_audio.c
b/testing/drivers/drivertest/drivertest_audio.c
similarity index 99%
rename from testing/drivertest/drivertest_audio.c
rename to testing/drivers/drivertest/drivertest_audio.c
index 5ce08329f..9ab9ebb6a 100644
--- a/testing/drivertest/drivertest_audio.c
+++ b/testing/drivers/drivertest/drivertest_audio.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/drivertest/drivertest_audio.c
+ * apps/testing/drivers/drivertest/drivertest_audio.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/drivertest/drivertest_block.c
b/testing/drivers/drivertest/drivertest_block.c
similarity index 99%
rename from testing/drivertest/drivertest_block.c
rename to testing/drivers/drivertest/drivertest_block.c
index daa655378..6dc70925d 100644
--- a/testing/drivertest/drivertest_block.c
+++ b/testing/drivers/drivertest/drivertest_block.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/drivertest/drivertest_block.c
+ * apps/testing/drivers/drivertest/drivertest_block.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/drivertest/drivertest_framebuffer.c
b/testing/drivers/drivertest/drivertest_framebuffer.c
similarity index 99%
rename from testing/drivertest/drivertest_framebuffer.c
rename to testing/drivers/drivertest/drivertest_framebuffer.c
index 2d84567eb..04ee135f3 100644
--- a/testing/drivertest/drivertest_framebuffer.c
+++ b/testing/drivers/drivertest/drivertest_framebuffer.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/drivertest/drivertest_framebuffer.c
+ * apps/testing/drivers/drivertest/drivertest_framebuffer.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/drivertest/drivertest_gpio.c
b/testing/drivers/drivertest/drivertest_gpio.c
similarity index 99%
rename from testing/drivertest/drivertest_gpio.c
rename to testing/drivers/drivertest/drivertest_gpio.c
index 32a0afd3d..d5e917976 100644
--- a/testing/drivertest/drivertest_gpio.c
+++ b/testing/drivers/drivertest/drivertest_gpio.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/drivertest/drivertest_gpio.c
+ * apps/testing/drivers/drivertest/drivertest_gpio.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/drivertest/drivertest_i2c_read.c
b/testing/drivers/drivertest/drivertest_i2c_read.c
similarity index 99%
rename from testing/drivertest/drivertest_i2c_read.c
rename to testing/drivers/drivertest/drivertest_i2c_read.c
index 9e87b0bdf..5b13b3c5e 100644
--- a/testing/drivertest/drivertest_i2c_read.c
+++ b/testing/drivers/drivertest/drivertest_i2c_read.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/drivertest/drivertest_i2c_read.c
+ * apps/testing/drivers/drivertest/drivertest_i2c_read.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/drivertest/drivertest_i2c_spi.c
b/testing/drivers/drivertest/drivertest_i2c_spi.c
similarity index 98%
rename from testing/drivertest/drivertest_i2c_spi.c
rename to testing/drivers/drivertest/drivertest_i2c_spi.c
index 1faaef177..b9a37afcf 100644
--- a/testing/drivertest/drivertest_i2c_spi.c
+++ b/testing/drivers/drivertest/drivertest_i2c_spi.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/drivertest/drivertest_i2c_spi.c
+ * apps/testing/drivers/drivertest/drivertest_i2c_spi.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/drivertest/drivertest_i2c_write.c
b/testing/drivers/drivertest/drivertest_i2c_write.c
similarity index 99%
rename from testing/drivertest/drivertest_i2c_write.c
rename to testing/drivers/drivertest/drivertest_i2c_write.c
index 959e8b62f..2e7b2fbe9 100644
--- a/testing/drivertest/drivertest_i2c_write.c
+++ b/testing/drivers/drivertest/drivertest_i2c_write.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/drivertest/drivertest_i2c_write.c
+ * apps/testing/drivers/drivertest/drivertest_i2c_write.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/drivertest/drivertest_lcd.c
b/testing/drivers/drivertest/drivertest_lcd.c
similarity index 99%
rename from testing/drivertest/drivertest_lcd.c
rename to testing/drivers/drivertest/drivertest_lcd.c
index 39530f79e..32cbaa30a 100644
--- a/testing/drivertest/drivertest_lcd.c
+++ b/testing/drivers/drivertest/drivertest_lcd.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/drivertest/drivertest_lcd.c
+ * apps/testing/drivers/drivertest/drivertest_lcd.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/drivertest/drivertest_mps2.c
b/testing/drivers/drivertest/drivertest_mps2.c
similarity index 99%
rename from testing/drivertest/drivertest_mps2.c
rename to testing/drivers/drivertest/drivertest_mps2.c
index 7ccbc1f21..9d33b4143 100644
--- a/testing/drivertest/drivertest_mps2.c
+++ b/testing/drivers/drivertest/drivertest_mps2.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/drivertest/drivertest_mps2.c
+ * apps/testing/drivers/drivertest/drivertest_mps2.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/drivertest/drivertest_mps2_isr_signal.c
b/testing/drivers/drivertest/drivertest_mps2_isr_signal.c
similarity index 98%
rename from testing/drivertest/drivertest_mps2_isr_signal.c
rename to testing/drivers/drivertest/drivertest_mps2_isr_signal.c
index 5157b679a..b274b6bd0 100644
--- a/testing/drivertest/drivertest_mps2_isr_signal.c
+++ b/testing/drivers/drivertest/drivertest_mps2_isr_signal.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/drivertest/drivertest_mps2_isr_signal.c
+ * apps/testing/drivers/drivertest/drivertest_mps2_isr_signal.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/drivertest/drivertest_mps2_zerointerrupt.c
b/testing/drivers/drivertest/drivertest_mps2_zerointerrupt.c
similarity index 99%
rename from testing/drivertest/drivertest_mps2_zerointerrupt.c
rename to testing/drivers/drivertest/drivertest_mps2_zerointerrupt.c
index 852404dec..6a15ee91d 100644
--- a/testing/drivertest/drivertest_mps2_zerointerrupt.c
+++ b/testing/drivers/drivertest/drivertest_mps2_zerointerrupt.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/drivertest/drivertest_mps2_zerointerrupt.c
+ * apps/testing/drivers/drivertest/drivertest_mps2_zerointerrupt.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/drivertest/drivertest_oneshot.c
b/testing/drivers/drivertest/drivertest_oneshot.c
similarity index 99%
rename from testing/drivertest/drivertest_oneshot.c
rename to testing/drivers/drivertest/drivertest_oneshot.c
index 6d7afcc75..f950c0ada 100644
--- a/testing/drivertest/drivertest_oneshot.c
+++ b/testing/drivers/drivertest/drivertest_oneshot.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/drivertest/drivertest_oneshot.c
+ * apps/testing/drivers/drivertest/drivertest_oneshot.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/drivertest/drivertest_pm.c
b/testing/drivers/drivertest/drivertest_pm.c
similarity index 99%
rename from testing/drivertest/drivertest_pm.c
rename to testing/drivers/drivertest/drivertest_pm.c
index fc8ee4bdc..a616b4227 100644
--- a/testing/drivertest/drivertest_pm.c
+++ b/testing/drivers/drivertest/drivertest_pm.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/drivertest/drivertest_pm.c
+ * apps/testing/drivers/drivertest/drivertest_pm.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/drivertest/drivertest_pm_runtime.c
b/testing/drivers/drivertest/drivertest_pm_runtime.c
similarity index 99%
rename from testing/drivertest/drivertest_pm_runtime.c
rename to testing/drivers/drivertest/drivertest_pm_runtime.c
index a0db9947c..8cef500d3 100644
--- a/testing/drivertest/drivertest_pm_runtime.c
+++ b/testing/drivers/drivertest/drivertest_pm_runtime.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/drivertest/drivertest_pm_runtime.c
+ * apps/testing/drivers/drivertest/drivertest_pm_runtime.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/drivertest/drivertest_pm_smp.c
b/testing/drivers/drivertest/drivertest_pm_smp.c
similarity index 99%
rename from testing/drivertest/drivertest_pm_smp.c
rename to testing/drivers/drivertest/drivertest_pm_smp.c
index 6edbb6694..5de71e546 100644
--- a/testing/drivertest/drivertest_pm_smp.c
+++ b/testing/drivers/drivertest/drivertest_pm_smp.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/drivertest/drivertest_pm_smp.c
+ * apps/testing/drivers/drivertest/drivertest_pm_smp.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/drivertest/drivertest_posix_timer.c
b/testing/drivers/drivertest/drivertest_posix_timer.c
similarity index 99%
rename from testing/drivertest/drivertest_posix_timer.c
rename to testing/drivers/drivertest/drivertest_posix_timer.c
index b52b1887d..e87dd7a33 100644
--- a/testing/drivertest/drivertest_posix_timer.c
+++ b/testing/drivers/drivertest/drivertest_posix_timer.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/drivertest/drivertest_posix_timer.c
+ * apps/testing/drivers/drivertest/drivertest_posix_timer.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/drivertest/drivertest_pwm.c
b/testing/drivers/drivertest/drivertest_pwm.c
similarity index 99%
rename from testing/drivertest/drivertest_pwm.c
rename to testing/drivers/drivertest/drivertest_pwm.c
index 18475184d..5869db08f 100644
--- a/testing/drivertest/drivertest_pwm.c
+++ b/testing/drivers/drivertest/drivertest_pwm.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/drivertest/drivertest_pwm.c
+ * apps/testing/drivers/drivertest/drivertest_pwm.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/drivertest/drivertest_regulator.c
b/testing/drivers/drivertest/drivertest_regulator.c
similarity index 99%
rename from testing/drivertest/drivertest_regulator.c
rename to testing/drivers/drivertest/drivertest_regulator.c
index bff19677c..19de21928 100644
--- a/testing/drivertest/drivertest_regulator.c
+++ b/testing/drivers/drivertest/drivertest_regulator.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/drivertest/drivertest_regulator.c
+ * apps/testing/drivers/drivertest/drivertest_regulator.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/drivertest/drivertest_relay.c
b/testing/drivers/drivertest/drivertest_relay.c
similarity index 99%
rename from testing/drivertest/drivertest_relay.c
rename to testing/drivers/drivertest/drivertest_relay.c
index 7a1671f88..53871d947 100644
--- a/testing/drivertest/drivertest_relay.c
+++ b/testing/drivers/drivertest/drivertest_relay.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/drivertest/drivertest_relay.c
+ * apps/testing/drivers/drivertest/drivertest_relay.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/drivertest/drivertest_rtc.c
b/testing/drivers/drivertest/drivertest_rtc.c
similarity index 99%
rename from testing/drivertest/drivertest_rtc.c
rename to testing/drivers/drivertest/drivertest_rtc.c
index 53ed2a5d1..e4cd03301 100644
--- a/testing/drivertest/drivertest_rtc.c
+++ b/testing/drivers/drivertest/drivertest_rtc.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/drivertest/drivertest_rtc.c
+ * apps/testing/drivers/drivertest/drivertest_rtc.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/drivertest/drivertest_simple.c
b/testing/drivers/drivertest/drivertest_simple.c
similarity index 97%
rename from testing/drivertest/drivertest_simple.c
rename to testing/drivers/drivertest/drivertest_simple.c
index 485b592e2..eea6c86d1 100644
--- a/testing/drivertest/drivertest_simple.c
+++ b/testing/drivers/drivertest/drivertest_simple.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/drivertest/drivertest_simple.c
+ * apps/testing/drivers/drivertest/drivertest_simple.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/drivertest/drivertest_timer.c
b/testing/drivers/drivertest/drivertest_timer.c
similarity index 99%
rename from testing/drivertest/drivertest_timer.c
rename to testing/drivers/drivertest/drivertest_timer.c
index 4478eda0f..55f054257 100644
--- a/testing/drivertest/drivertest_timer.c
+++ b/testing/drivers/drivertest/drivertest_timer.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/drivertest/drivertest_timer.c
+ * apps/testing/drivers/drivertest/drivertest_timer.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/drivertest/drivertest_touchpanel.c
b/testing/drivers/drivertest/drivertest_touchpanel.c
similarity index 99%
rename from testing/drivertest/drivertest_touchpanel.c
rename to testing/drivers/drivertest/drivertest_touchpanel.c
index 9f0255ec6..b354760c6 100644
--- a/testing/drivertest/drivertest_touchpanel.c
+++ b/testing/drivers/drivertest/drivertest_touchpanel.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/drivertest/drivertest_touchpanel.c
+ * apps/testing/drivers/drivertest/drivertest_touchpanel.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/drivertest/drivertest_uart.c
b/testing/drivers/drivertest/drivertest_uart.c
similarity index 99%
rename from testing/drivertest/drivertest_uart.c
rename to testing/drivers/drivertest/drivertest_uart.c
index cbe127b7c..23875b176 100644
--- a/testing/drivertest/drivertest_uart.c
+++ b/testing/drivers/drivertest/drivertest_uart.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/drivertest/drivertest_uart.c
+ * apps/testing/drivers/drivertest/drivertest_uart.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/drivertest/drivertest_watchdog.c
b/testing/drivers/drivertest/drivertest_watchdog.c
similarity index 99%
rename from testing/drivertest/drivertest_watchdog.c
rename to testing/drivers/drivertest/drivertest_watchdog.c
index 8efa41eb2..a9240479e 100644
--- a/testing/drivertest/drivertest_watchdog.c
+++ b/testing/drivers/drivertest/drivertest_watchdog.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/drivertest/drivertest_watchdog.c
+ * apps/testing/drivers/drivertest/drivertest_watchdog.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/drivertest/test_content_gen.py
b/testing/drivers/drivertest/test_content_gen.py
similarity index 98%
rename from testing/drivertest/test_content_gen.py
rename to testing/drivers/drivertest/test_content_gen.py
index 3045252d1..77ebeb38f 100644
--- a/testing/drivertest/test_content_gen.py
+++ b/testing/drivers/drivertest/test_content_gen.py
@@ -1,6 +1,6 @@
#!/bin/python3
#############################################################################
-# apps/testing/drivertest/cmocka_driver_uart/test_content_gen.py
+# apps/testing/drivers/drivertest/cmocka_driver_uart/test_content_gen.py
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/fftest/CMakeLists.txt
b/testing/drivers/fftest/CMakeLists.txt
similarity index 96%
rename from testing/fftest/CMakeLists.txt
rename to testing/drivers/fftest/CMakeLists.txt
index 77513c601..bf5fca5ca 100644
--- a/testing/fftest/CMakeLists.txt
+++ b/testing/drivers/fftest/CMakeLists.txt
@@ -1,5 +1,5 @@
#
##############################################################################
-# apps/testing/fftest/CMakeLists.txt
+# apps/testing/drivers/fftest/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/fftest/Kconfig b/testing/drivers/fftest/Kconfig
similarity index 100%
rename from testing/fftest/Kconfig
rename to testing/drivers/fftest/Kconfig
diff --git a/testing/fftest/Make.defs b/testing/drivers/fftest/Make.defs
similarity index 91%
rename from testing/fftest/Make.defs
rename to testing/drivers/fftest/Make.defs
index 0190fb4f2..a02bc75dd 100644
--- a/testing/fftest/Make.defs
+++ b/testing/drivers/fftest/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/fftest/Make.defs
+# apps/testing/drivers/fftest/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -21,5 +21,5 @@
############################################################################
ifneq ($(CONFIG_TESTING_FF),)
-CONFIGURED_APPS += $(APPDIR)/testing/fftest
+CONFIGURED_APPS += $(APPDIR)/testing/drivers/fftest
endif
diff --git a/testing/fftest/Makefile b/testing/drivers/fftest/Makefile
similarity index 96%
rename from testing/fftest/Makefile
rename to testing/drivers/fftest/Makefile
index 981d502f1..56e8fc56f 100644
--- a/testing/fftest/Makefile
+++ b/testing/drivers/fftest/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/fftest/Makefile
+# apps/testing/drivers/fftest/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/fftest/fftest.c b/testing/drivers/fftest/fftest.c
similarity index 99%
rename from testing/fftest/fftest.c
rename to testing/drivers/fftest/fftest.c
index 51700914a..67871195c 100644
--- a/testing/fftest/fftest.c
+++ b/testing/drivers/fftest/fftest.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/fftest/fftest.c
+ * apps/testing/drivers/fftest/fftest.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/nand_sim/CMakeLists.txt
b/testing/drivers/nand_sim/CMakeLists.txt
similarity index 96%
rename from testing/nand_sim/CMakeLists.txt
rename to testing/drivers/nand_sim/CMakeLists.txt
index 4f9b4021c..e3c00504c 100644
--- a/testing/nand_sim/CMakeLists.txt
+++ b/testing/drivers/nand_sim/CMakeLists.txt
@@ -1,5 +1,5 @@
#
##############################################################################
-# apps/testing/nand_sim/CMakeLists.txt
+# apps/testing/drivers/nand_sim/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/nand_sim/Kconfig b/testing/drivers/nand_sim/Kconfig
similarity index 100%
rename from testing/nand_sim/Kconfig
rename to testing/drivers/nand_sim/Kconfig
diff --git a/testing/nand_sim/Make.defs b/testing/drivers/nand_sim/Make.defs
similarity index 91%
rename from testing/nand_sim/Make.defs
rename to testing/drivers/nand_sim/Make.defs
index 05557f6de..6e573c87b 100644
--- a/testing/nand_sim/Make.defs
+++ b/testing/drivers/nand_sim/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/nand_sim/Make.defs
+# apps/testing/drivers/nand_sim/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -21,5 +21,5 @@
############################################################################
ifneq ($(CONFIG_TESTING_NAND_SIM),)
-CONFIGURED_APPS += $(APPDIR)/testing/nand_sim
+CONFIGURED_APPS += $(APPDIR)/testing/drivers/nand_sim
endif
diff --git a/testing/nand_sim/Makefile b/testing/drivers/nand_sim/Makefile
similarity index 96%
rename from testing/nand_sim/Makefile
rename to testing/drivers/nand_sim/Makefile
index a66579209..1aecf0d36 100644
--- a/testing/nand_sim/Makefile
+++ b/testing/drivers/nand_sim/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/nand_sim/Makefile
+# apps/testing/drivers/nand_sim/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/nand_sim/nand_sim_main.c
b/testing/drivers/nand_sim/nand_sim_main.c
similarity index 99%
rename from testing/nand_sim/nand_sim_main.c
rename to testing/drivers/nand_sim/nand_sim_main.c
index 63e64b91f..9e91227a4 100644
--- a/testing/nand_sim/nand_sim_main.c
+++ b/testing/drivers/nand_sim/nand_sim_main.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/nand_sim/nand_sim_main.c
+ * apps/testing/drivers/nand_sim/nand_sim_main.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/pcitest/Kconfig b/testing/drivers/pcitest/Kconfig
similarity index 100%
rename from testing/pcitest/Kconfig
rename to testing/drivers/pcitest/Kconfig
diff --git a/testing/pcitest/Make.defs b/testing/drivers/pcitest/Make.defs
similarity index 91%
rename from testing/pcitest/Make.defs
rename to testing/drivers/pcitest/Make.defs
index 985276be2..a939dbf46 100644
--- a/testing/pcitest/Make.defs
+++ b/testing/drivers/pcitest/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/pcitest/Make.defs
+# apps/testing/drivers/pcitest/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -21,5 +21,5 @@
############################################################################
ifneq ($(CONFIG_TESTING_PCITEST),)
-CONFIGURED_APPS += $(APPDIR)/testing/pcitest
+CONFIGURED_APPS += $(APPDIR)/testing/drivers/pcitest
endif
diff --git a/testing/pcitest/Makefile b/testing/drivers/pcitest/Makefile
similarity index 96%
rename from testing/pcitest/Makefile
rename to testing/drivers/pcitest/Makefile
index 46c7050bf..e16e66f89 100644
--- a/testing/pcitest/Makefile
+++ b/testing/drivers/pcitest/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/pcitest/Makefile
+# apps/testing/drivers/pcitest/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/pcitest/pcitest.c b/testing/drivers/pcitest/pcitest.c
similarity index 99%
rename from testing/pcitest/pcitest.c
rename to testing/drivers/pcitest/pcitest.c
index 2814c0c51..684498d24 100644
--- a/testing/pcitest/pcitest.c
+++ b/testing/drivers/pcitest/pcitest.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/testing/pcitest/pcitest.c
+ * apps/testing/drivers/pcitest/pcitest.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/testing/sd_stress/Kconfig b/testing/drivers/sd_stress/Kconfig
similarity index 100%
rename from testing/sd_stress/Kconfig
rename to testing/drivers/sd_stress/Kconfig
diff --git a/testing/sd_stress/Make.defs b/testing/drivers/sd_stress/Make.defs
similarity index 91%
rename from testing/sd_stress/Make.defs
rename to testing/drivers/sd_stress/Make.defs
index 1da23f092..4d184b4d0 100644
--- a/testing/sd_stress/Make.defs
+++ b/testing/drivers/sd_stress/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/sd_stress/Make.defs
+# apps/testing/drivers/sd_stress/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -21,5 +21,5 @@
############################################################################
ifneq ($(CONFIG_TESTING_SD_STRESS),)
-CONFIGURED_APPS += $(APPDIR)/testing/sd_stress
+CONFIGURED_APPS += $(APPDIR)/testing/drivers/sd_stress
endif
diff --git a/testing/sd_stress/Makefile b/testing/drivers/sd_stress/Makefile
similarity index 96%
rename from testing/sd_stress/Makefile
rename to testing/drivers/sd_stress/Makefile
index a70d6857d..a4f162186 100644
--- a/testing/sd_stress/Makefile
+++ b/testing/drivers/sd_stress/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# apps/testing/sd_stress/Makefile
+# apps/testing/drivers/sd_stress/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/testing/sd_stress/sd_stress_main.c
b/testing/drivers/sd_stress/sd_stress_main.c
similarity index 99%
rename from testing/sd_stress/sd_stress_main.c
rename to testing/drivers/sd_stress/sd_stress_main.c
index ddb598e80..afcf528a0 100644
--- a/testing/sd_stress/sd_stress_main.c
+++ b/testing/drivers/sd_stress/sd_stress_main.c
@@ -1,9 +1,9 @@
/****************************************************************************
- * apps/testing/sd_stress/sd_stress_main.c
+ * apps/testing/drivers/sd_stress/sd_stress_main.c
*
* SPDX-License-Identifier: BSD-3-Clause
- * SPDX-FileCopyrightText: 2016-2021 PX4 Development Team. All rights reserved.
- *
+ * SPDX-FileCopyrightText: 2016-2021 PX4 Development Team. All rights
+ * reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
