diff --git a/testing/drivers/.gitignore b/testing/drivers/.gitignore new file mode 100644 index 00000000000..9e1d2593ee8 --- /dev/null +++ b/testing/drivers/.gitignore @@ -0,0 +1 @@ +/Kconfig diff --git a/testing/drivers/CMakeLists.txt b/testing/drivers/CMakeLists.txt new file mode 100644 index 00000000000..e796e074acf --- /dev/null +++ b/testing/drivers/CMakeLists.txt @@ -0,0 +1,24 @@ +# ############################################################################## +# apps/testing/drivers/CMakeLists.txt +# +# SPDX-License-Identifier: Apache-2.0 +# +# Licensed to the Apache Software Foundation (ASF) under one or more contributor +# license agreements. See the NOTICE file distributed with this work for +# additional information regarding copyright ownership. The ASF licenses this +# file to you under the Apache License, Version 2.0 (the "License"); you may not +# use this file except in compliance with the License. You may obtain a copy of +# the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations under +# the License. +# +# ############################################################################## + +nuttx_add_subdirectory() +nuttx_generate_kconfig(MENUDESC "drivers") diff --git a/testing/drivers/Make.defs b/testing/drivers/Make.defs new file mode 100644 index 00000000000..4da87143940 --- /dev/null +++ b/testing/drivers/Make.defs @@ -0,0 +1,23 @@ +############################################################################ +# apps/testing/drivers/Make.defs +# +# SPDX-License-Identifier: Apache-2.0 +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. The +# ASF licenses this file to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +############################################################################ + +include $(wildcard $(APPDIR)/testing/drivers/*/Make.defs) diff --git a/testing/drivers/Makefile b/testing/drivers/Makefile new file mode 100644 index 00000000000..a0da405f43b --- /dev/null +++ b/testing/drivers/Makefile @@ -0,0 +1,25 @@ +############################################################################ +# apps/testing/drivers/Makefile +# +# SPDX-License-Identifier: Apache-2.0 +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. The +# ASF licenses this file to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +############################################################################ + +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 a3add4dca40..2492842304b 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 a68b7e050e6..5e6a005340f 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 aa25dfa8381..470c9151297 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 267ed770ac4..d9360b3793b 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 5ce08329f15..9ab9ebb6ae9 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 daa655378d2..6dc70925d58 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 2d84567eb26..04ee135f3d1 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 32a0afd3d48..d5e917976ba 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 9e87b0bdf56..5b13b3c5ef8 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 1faaef177a5..b9a37afcfd8 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 959e8b62fcd..2e7b2fbe993 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 39530f79e20..32cbaa30a05 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 7ccbc1f2142..9d33b4143b3 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 5157b679a35..b274b6bd04c 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 852404dec5d..6a15ee91dc8 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 6d7afcc75ca..f950c0ada1b 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 fc8ee4bdc38..a616b4227c3 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 a0db9947c9f..8cef500d38f 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 6edbb66948a..5de71e546a3 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 b52b1887de1..e87dd7a3374 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 18475184d5e..5869db08f88 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 bff19677c6e..19de21928ea 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 7a1671f88fc..53871d94758 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 53ed2a5d11f..e4cd03301f2 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 485b592e203..eea6c86d16f 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 4478eda0f4e..55f05425754 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 9f0255ec6ce..b354760c6ac 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 cbe127b7c77..23875b17628 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 8efa41eb2b2..a9240479ef9 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 3045252d1e9..77ebeb38f8d 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 77513c6012b..bf5fca5cadf 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 0190fb4f21e..a02bc75dddf 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 981d502f136..56e8fc56fe0 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 51700914ab9..67871195c7e 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 4f9b4021c60..e3c00504cb8 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 05557f6de6c..6e573c87bf1 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 a665792095e..1aecf0d36d5 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 63e64b91faf..9e91227a4ad 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 985276be2d4..a939dbf46be 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 46c7050bf56..e16e66f89dd 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 2814c0c517e..684498d24fe 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 1da23f092af..4d184b4d0b3 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 a70d6857d7b..a4f162186ee 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 ddb598e804f..afcf528a01f 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: diff --git a/testing/fs/.gitignore b/testing/fs/.gitignore new file mode 100644 index 00000000000..f486022d8c4 --- /dev/null +++ b/testing/fs/.gitignore @@ -0,0 +1 @@ +/kconfig diff --git a/testing/fs/CMakeLists.txt b/testing/fs/CMakeLists.txt new file mode 100644 index 00000000000..186ef20ef9c --- /dev/null +++ b/testing/fs/CMakeLists.txt @@ -0,0 +1,24 @@ +# ############################################################################## +# apps/testing/fs/CMakeLists.txt +# +# SPDX-License-Identifier: Apache-2.0 +# +# Licensed to the Apache Software Foundation (ASF) under one or more contributor +# license agreements. See the NOTICE file distributed with this work for +# additional information regarding copyright ownership. The ASF licenses this +# file to you under the Apache License, Version 2.0 (the "License"); you may not +# use this file except in compliance with the License. You may obtain a copy of +# the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations under +# the License. +# +# ############################################################################## + +nuttx_add_subdirectory() +nuttx_generate_kconfig(MENUDESC "fs") diff --git a/testing/fs/Make.defs b/testing/fs/Make.defs new file mode 100644 index 00000000000..fd956a02603 --- /dev/null +++ b/testing/fs/Make.defs @@ -0,0 +1,23 @@ +############################################################################ +# apps/testing/fs/Make.defs +# +# SPDX-License-Identifier: Apache-2.0 +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. The +# ASF licenses this file to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +############################################################################ + +include $(wildcard $(APPDIR)/testing/fs/*/Make.defs) diff --git a/testing/fs/Makefile b/testing/fs/Makefile new file mode 100644 index 00000000000..75783de891a --- /dev/null +++ b/testing/fs/Makefile @@ -0,0 +1,25 @@ +############################################################################ +# apps/testing/fs/Makefile +# +# SPDX-License-Identifier: Apache-2.0 +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. The +# ASF licenses this file to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +############################################################################ + +MENUDESC = "fs" + +include $(APPDIR)/Directory.mk diff --git a/testing/epoll/CMakeLists.txt b/testing/fs/epoll/CMakeLists.txt similarity index 96% rename from testing/epoll/CMakeLists.txt rename to testing/fs/epoll/CMakeLists.txt index 3839141e1d4..2428f36125d 100644 --- a/testing/epoll/CMakeLists.txt +++ b/testing/fs/epoll/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/epoll/CMakeLists.txt +# apps/testing/fs/epoll/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/epoll/Kconfig b/testing/fs/epoll/Kconfig similarity index 100% rename from testing/epoll/Kconfig rename to testing/fs/epoll/Kconfig diff --git a/testing/epoll/Make.defs b/testing/fs/epoll/Make.defs similarity index 92% rename from testing/epoll/Make.defs rename to testing/fs/epoll/Make.defs index fbabd40594a..d9f822e36ec 100644 --- a/testing/epoll/Make.defs +++ b/testing/fs/epoll/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/epoll/Make.defs +# apps/testing/fs/epoll/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_EPOLL),) -CONFIGURED_APPS += $(APPDIR)/testing/epoll +CONFIGURED_APPS += $(APPDIR)/testing/fs/epoll endif diff --git a/testing/epoll/Makefile b/testing/fs/epoll/Makefile similarity index 97% rename from testing/epoll/Makefile rename to testing/fs/epoll/Makefile index 2a78ea7ac8f..a03158421e3 100644 --- a/testing/epoll/Makefile +++ b/testing/fs/epoll/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/epoll/Makefile +# apps/testing/fs/epoll/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/epoll/epoll.c b/testing/fs/epoll/epoll.c similarity index 99% rename from testing/epoll/epoll.c rename to testing/fs/epoll/epoll.c index 970a7ad4cbb..cd1d6cc0f4e 100644 --- a/testing/epoll/epoll.c +++ b/testing/fs/epoll/epoll.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/epoll/epoll.c + * apps/testing/fs/epoll/epoll.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/fatutf8/CMakeLists.txt b/testing/fs/fatutf8/CMakeLists.txt similarity index 96% rename from testing/fatutf8/CMakeLists.txt rename to testing/fs/fatutf8/CMakeLists.txt index 276ae93a91a..cc7a803224a 100644 --- a/testing/fatutf8/CMakeLists.txt +++ b/testing/fs/fatutf8/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/fatutf8/CMakeLists.txt +# apps/testing/fs/fatutf8/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/fatutf8/Kconfig b/testing/fs/fatutf8/Kconfig similarity index 100% rename from testing/fatutf8/Kconfig rename to testing/fs/fatutf8/Kconfig diff --git a/testing/fatutf8/Make.defs b/testing/fs/fatutf8/Make.defs similarity index 92% rename from testing/fatutf8/Make.defs rename to testing/fs/fatutf8/Make.defs index 2c62dc1fa8d..be545cf31d3 100644 --- a/testing/fatutf8/Make.defs +++ b/testing/fs/fatutf8/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/fatutf8/Make.defs +# apps/testing/fs/fatutf8/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_FATUTF8),) -CONFIGURED_APPS += $(APPDIR)/testing/fatutf8 +CONFIGURED_APPS += $(APPDIR)/testing/fs/fatutf8 endif diff --git a/testing/fatutf8/Makefile b/testing/fs/fatutf8/Makefile similarity index 97% rename from testing/fatutf8/Makefile rename to testing/fs/fatutf8/Makefile index e43198ec30a..97064eedfcd 100644 --- a/testing/fatutf8/Makefile +++ b/testing/fs/fatutf8/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/fatutf8/Makefile +# apps/testing/fs/fatutf8/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/fatutf8/fatutf8_main.c b/testing/fs/fatutf8/fatutf8_main.c similarity index 99% rename from testing/fatutf8/fatutf8_main.c rename to testing/fs/fatutf8/fatutf8_main.c index 6975294e83c..11a3daca40e 100644 --- a/testing/fatutf8/fatutf8_main.c +++ b/testing/fs/fatutf8/fatutf8_main.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/fatutf8/fatutf8_main.c + * apps/testing/fs/fatutf8/fatutf8_main.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/fdsantest/CMakeLists.txt b/testing/fs/fdsantest/CMakeLists.txt similarity index 96% rename from testing/fdsantest/CMakeLists.txt rename to testing/fs/fdsantest/CMakeLists.txt index f6a5f7be15e..f2da2d6ba7d 100644 --- a/testing/fdsantest/CMakeLists.txt +++ b/testing/fs/fdsantest/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/fdsantest/CMakeLists.txt +# apps/testing/fs/fdsantest/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/fdsantest/Kconfig b/testing/fs/fdsantest/Kconfig similarity index 93% rename from testing/fdsantest/Kconfig rename to testing/fs/fdsantest/Kconfig index 97d82510cfc..063f7092c7f 100644 --- a/testing/fdsantest/Kconfig +++ b/testing/fs/fdsantest/Kconfig @@ -4,7 +4,7 @@ # config TESTING_FDSAN_TEST - tristate "vela cmocka fdsan test" + tristate "Nuttx cmocka fdsan test" default n depends on TESTING_CMOCKA ---help--- diff --git a/testing/fdsantest/Make.defs b/testing/fs/fdsantest/Make.defs similarity index 92% rename from testing/fdsantest/Make.defs rename to testing/fs/fdsantest/Make.defs index 4be99c97550..a6e03ba8034 100644 --- a/testing/fdsantest/Make.defs +++ b/testing/fs/fdsantest/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/fdsantest/Make.defs +# apps/testing/fs/fdsantest/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_FDSAN_TEST),) -CONFIGURED_APPS += $(APPDIR)/testing/fdsantest +CONFIGURED_APPS += $(APPDIR)/testing/fs/fdsantest endif diff --git a/testing/fdsantest/Makefile b/testing/fs/fdsantest/Makefile similarity index 97% rename from testing/fdsantest/Makefile rename to testing/fs/fdsantest/Makefile index cddf85651f5..ee2df0850d6 100644 --- a/testing/fdsantest/Makefile +++ b/testing/fs/fdsantest/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/fdsantest/Makefile +# apps/testing/fs/fdsantest/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/fdsantest/fdsantest_simple.c b/testing/fs/fdsantest/fdsantest_simple.c similarity index 98% rename from testing/fdsantest/fdsantest_simple.c rename to testing/fs/fdsantest/fdsantest_simple.c index ab4068c7f8b..128e2878bff 100644 --- a/testing/fdsantest/fdsantest_simple.c +++ b/testing/fs/fdsantest/fdsantest_simple.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/fdsantest/fdsantest_simple.c + * apps/testing/fs/fdsantest/fdsantest_simple.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/fopencookie/Kconfig b/testing/fs/fopencookie/Kconfig similarity index 100% rename from testing/fopencookie/Kconfig rename to testing/fs/fopencookie/Kconfig diff --git a/testing/fopencookie/Make.defs b/testing/fs/fopencookie/Make.defs similarity index 91% rename from testing/fopencookie/Make.defs rename to testing/fs/fopencookie/Make.defs index 778de83a9e2..70ab59fee93 100644 --- a/testing/fopencookie/Make.defs +++ b/testing/fs/fopencookie/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/fopencookie/Make.defs +# apps/testing/fs/fopencookie/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_FOPENCOOKIE_TEST),) -CONFIGURED_APPS += $(APPDIR)/testing/fopencookie +CONFIGURED_APPS += $(APPDIR)/testing/fs/fopencookie endif diff --git a/testing/fopencookie/Makefile b/testing/fs/fopencookie/Makefile similarity index 96% rename from testing/fopencookie/Makefile rename to testing/fs/fopencookie/Makefile index 4af65d1f923..6ad0d6d9364 100644 --- a/testing/fopencookie/Makefile +++ b/testing/fs/fopencookie/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/fopencookie/Makefile +# apps/testing/fs/fopencookie/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/fopencookie/fopencookie.c b/testing/fs/fopencookie/fopencookie.c similarity index 99% rename from testing/fopencookie/fopencookie.c rename to testing/fs/fopencookie/fopencookie.c index 0c35a40da6c..02d943c2639 100644 --- a/testing/fopencookie/fopencookie.c +++ b/testing/fs/fopencookie/fopencookie.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/fopencookie/fopencookie.c + * apps/testing/fs/fopencookie/fopencookie.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/fstest/CMakeLists.txt b/testing/fs/fstest/CMakeLists.txt similarity index 96% rename from testing/fstest/CMakeLists.txt rename to testing/fs/fstest/CMakeLists.txt index 5b938a337dd..0228a8109dd 100644 --- a/testing/fstest/CMakeLists.txt +++ b/testing/fs/fstest/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/fstest/CMakeLists.txt +# apps/testing/fs/fstest/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/fstest/Kconfig b/testing/fs/fstest/Kconfig similarity index 100% rename from testing/fstest/Kconfig rename to testing/fs/fstest/Kconfig diff --git a/testing/fstest/Make.defs b/testing/fs/fstest/Make.defs similarity index 92% rename from testing/fstest/Make.defs rename to testing/fs/fstest/Make.defs index 4545509e9a4..905a947d8c5 100644 --- a/testing/fstest/Make.defs +++ b/testing/fs/fstest/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/fstest/Make.defs +# apps/testing/fs/fstest/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_FSTEST),) -CONFIGURED_APPS += $(APPDIR)/testing/fstest +CONFIGURED_APPS += $(APPDIR)/testing/fs/fstest endif diff --git a/testing/fstest/Makefile b/testing/fs/fstest/Makefile similarity index 97% rename from testing/fstest/Makefile rename to testing/fs/fstest/Makefile index 4a845eb7995..ab2cecd69df 100644 --- a/testing/fstest/Makefile +++ b/testing/fs/fstest/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/fstest/Makefile +# apps/testing/fs/fstest/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/fstest/fstest_main.c b/testing/fs/fstest/fstest_main.c similarity index 99% rename from testing/fstest/fstest_main.c rename to testing/fs/fstest/fstest_main.c index 0579dff36b1..68ea1f71914 100644 --- a/testing/fstest/fstest_main.c +++ b/testing/fs/fstest/fstest_main.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/fstest/fstest_main.c + * apps/testing/fs/fstest/fstest_main.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/mtd_config_fs/CMakeLists.txt b/testing/fs/mtd_config_fs/CMakeLists.txt similarity index 96% rename from testing/mtd_config_fs/CMakeLists.txt rename to testing/fs/mtd_config_fs/CMakeLists.txt index 30056c35f7d..70201dca934 100644 --- a/testing/mtd_config_fs/CMakeLists.txt +++ b/testing/fs/mtd_config_fs/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/mtd_config_fs/CMakeLists.txt +# apps/testing/fs/mtd_config_fs/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/mtd_config_fs/Kconfig b/testing/fs/mtd_config_fs/Kconfig similarity index 100% rename from testing/mtd_config_fs/Kconfig rename to testing/fs/mtd_config_fs/Kconfig diff --git a/testing/mtd_config_fs/Make.defs b/testing/fs/mtd_config_fs/Make.defs similarity index 91% rename from testing/mtd_config_fs/Make.defs rename to testing/fs/mtd_config_fs/Make.defs index 424b907fd0b..0c8bde14c0f 100644 --- a/testing/mtd_config_fs/Make.defs +++ b/testing/fs/mtd_config_fs/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/mtd_config_fs/Make.defs +# apps/testing/fs/mtd_config_fs/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_MTD_CONFIG_FAIL_SAFE),) -CONFIGURED_APPS += $(APPDIR)/testing/mtd_config_fs +CONFIGURED_APPS += $(APPDIR)/testing/fs/mtd_config_fs endif diff --git a/testing/mtd_config_fs/Makefile b/testing/fs/mtd_config_fs/Makefile similarity index 97% rename from testing/mtd_config_fs/Makefile rename to testing/fs/mtd_config_fs/Makefile index 601e42f616a..c3ad88386ea 100644 --- a/testing/mtd_config_fs/Makefile +++ b/testing/fs/mtd_config_fs/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/mtd_config_fs/Makefile +# apps/testing/fs/mtd_config_fs/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/mtd_config_fs/mtd_config_fs_test_main.c b/testing/fs/mtd_config_fs/mtd_config_fs_test_main.c similarity index 99% rename from testing/mtd_config_fs/mtd_config_fs_test_main.c rename to testing/fs/mtd_config_fs/mtd_config_fs_test_main.c index 5ebc2f99057..5c44a6a1dcb 100644 --- a/testing/mtd_config_fs/mtd_config_fs_test_main.c +++ b/testing/fs/mtd_config_fs/mtd_config_fs_test_main.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/mtd_config_fs/mtd_config_fs_test_main.c + * apps/testing/fs/mtd_config_fs/mtd_config_fs_test_main.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/nxffs/CMakeLists.txt b/testing/fs/nxffs/CMakeLists.txt similarity index 96% rename from testing/nxffs/CMakeLists.txt rename to testing/fs/nxffs/CMakeLists.txt index 493b2c29e7e..337c19e025c 100644 --- a/testing/nxffs/CMakeLists.txt +++ b/testing/fs/nxffs/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/nxffs/CMakeLists.txt +# apps/testing/fs/nxffs/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/nxffs/Kconfig b/testing/fs/nxffs/Kconfig similarity index 100% rename from testing/nxffs/Kconfig rename to testing/fs/nxffs/Kconfig diff --git a/testing/nxffs/Make.defs b/testing/fs/nxffs/Make.defs similarity index 92% rename from testing/nxffs/Make.defs rename to testing/fs/nxffs/Make.defs index 6fb1fd54e6d..89ae6c92507 100644 --- a/testing/nxffs/Make.defs +++ b/testing/fs/nxffs/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/nxffs/Make.defs +# apps/testing/fs/nxffs/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_NXFFS),) -CONFIGURED_APPS += $(APPDIR)/testing/nxffs +CONFIGURED_APPS += $(APPDIR)/testing/fs/nxffs endif diff --git a/testing/nxffs/Makefile b/testing/fs/nxffs/Makefile similarity index 97% rename from testing/nxffs/Makefile rename to testing/fs/nxffs/Makefile index c03d5d05dec..14a7cac6f31 100644 --- a/testing/nxffs/Makefile +++ b/testing/fs/nxffs/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/nxffs/Makefile +# apps/testing/fs/nxffs/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/nxffs/nxffs_main.c b/testing/fs/nxffs/nxffs_main.c similarity index 99% rename from testing/nxffs/nxffs_main.c rename to testing/fs/nxffs/nxffs_main.c index 46f2fb2a582..25c15513a2e 100644 --- a/testing/nxffs/nxffs_main.c +++ b/testing/fs/nxffs/nxffs_main.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/nxffs/nxffs_main.c + * apps/testing/fs/nxffs/nxffs_main.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/smart/CMakeLists.txt b/testing/fs/smart/CMakeLists.txt similarity index 96% rename from testing/smart/CMakeLists.txt rename to testing/fs/smart/CMakeLists.txt index 091f1fdf39b..fc136b91e8e 100644 --- a/testing/smart/CMakeLists.txt +++ b/testing/fs/smart/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/smart/CMakeLists.txt +# apps/testing/fs/smart/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/smart/Kconfig b/testing/fs/smart/Kconfig similarity index 100% rename from testing/smart/Kconfig rename to testing/fs/smart/Kconfig diff --git a/testing/smart/Make.defs b/testing/fs/smart/Make.defs similarity index 92% rename from testing/smart/Make.defs rename to testing/fs/smart/Make.defs index 771631a8b91..099ab8f5c29 100644 --- a/testing/smart/Make.defs +++ b/testing/fs/smart/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/smart/Make.defs +# apps/testing/fs/smart/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_SMART),) -CONFIGURED_APPS += $(APPDIR)/testing/smart +CONFIGURED_APPS += $(APPDIR)/testing/fs/smart endif diff --git a/testing/smart/Makefile b/testing/fs/smart/Makefile similarity index 97% rename from testing/smart/Makefile rename to testing/fs/smart/Makefile index deebbc53589..9618f6a7ac6 100644 --- a/testing/smart/Makefile +++ b/testing/fs/smart/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/smart/Makefile +# apps/testing/fs/smart/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/smart/smart_main.c b/testing/fs/smart/smart_main.c similarity index 99% rename from testing/smart/smart_main.c rename to testing/fs/smart/smart_main.c index 03dd897bb0c..671f5b5cbd0 100644 --- a/testing/smart/smart_main.c +++ b/testing/fs/smart/smart_main.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/smart/smart_main.c + * apps/testing/fs/smart/smart_main.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/smart_test/CMakeLists.txt b/testing/fs/smart_test/CMakeLists.txt similarity index 96% rename from testing/smart_test/CMakeLists.txt rename to testing/fs/smart_test/CMakeLists.txt index 057e56282dd..a9a6a72807d 100644 --- a/testing/smart_test/CMakeLists.txt +++ b/testing/fs/smart_test/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/smart_test/CMakeLists.txt +# apps/testing/fs/smart_test/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/smart_test/Kconfig b/testing/fs/smart_test/Kconfig similarity index 100% rename from testing/smart_test/Kconfig rename to testing/fs/smart_test/Kconfig diff --git a/testing/smart_test/Make.defs b/testing/fs/smart_test/Make.defs similarity index 91% rename from testing/smart_test/Make.defs rename to testing/fs/smart_test/Make.defs index e02270134ff..4b866a3ac0d 100644 --- a/testing/smart_test/Make.defs +++ b/testing/fs/smart_test/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/smart_test/Make.defs +# apps/testing/fs/smart_test/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_SMART_TEST),) -CONFIGURED_APPS += $(APPDIR)/testing/smart_test +CONFIGURED_APPS += $(APPDIR)/testing/fs/smart_test endif diff --git a/testing/smart_test/Makefile b/testing/fs/smart_test/Makefile similarity index 96% rename from testing/smart_test/Makefile rename to testing/fs/smart_test/Makefile index 835a1751ee1..524c2b41d58 100644 --- a/testing/smart_test/Makefile +++ b/testing/fs/smart_test/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/smart_test/Makefile +# apps/testing/fs/smart_test/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/smart_test/smart_test.c b/testing/fs/smart_test/smart_test.c similarity index 99% rename from testing/smart_test/smart_test.c rename to testing/fs/smart_test/smart_test.c index 1650ba7acd1..13bd393c891 100644 --- a/testing/smart_test/smart_test.c +++ b/testing/fs/smart_test/smart_test.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/smart_test/smart_test.c + * apps/testing/fs/smart_test/smart_test.c * * SPDX-License-Identifier: Apache-2.0 *