diff --git a/.gitignore b/.gitignore index d183a413f57..0e0457e2c5e 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,11 @@ build .ccls-cache compile_commands.json .aider* +testing/arch/Kconfig +testing/cxx/Kconfig +testing/driver/Kconfig +testing/fs/Kconfig +testing/libc/Kconfig +testing/mm/Kconfig +testing/sched/Kconfig +testing/security/Kconfig \ No newline at end of file diff --git a/testing/arch/CMakeLists.txt b/testing/arch/CMakeLists.txt new file mode 100644 index 00000000000..8aba6b9ccdc --- /dev/null +++ b/testing/arch/CMakeLists.txt @@ -0,0 +1,24 @@ +# ############################################################################## +# apps/testing/arch/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 "arch") diff --git a/testing/arch/Make.defs b/testing/arch/Make.defs new file mode 100644 index 00000000000..07be33aec9c --- /dev/null +++ b/testing/arch/Make.defs @@ -0,0 +1,23 @@ +############################################################################ +# apps/testing/arch/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/arch/*/Make.defs) diff --git a/testing/arch/Makefile b/testing/arch/Makefile new file mode 100644 index 00000000000..bbf6c42804b --- /dev/null +++ b/testing/arch/Makefile @@ -0,0 +1,25 @@ +############################################################################ +# apps/testing/arch/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 = "arch" + +include $(APPDIR)/Directory.mk diff --git a/testing/himem_test/Kconfig b/testing/arch/himem_test/Kconfig similarity index 100% rename from testing/himem_test/Kconfig rename to testing/arch/himem_test/Kconfig diff --git a/testing/himem_test/LibIncludes.mk b/testing/arch/himem_test/LibIncludes.mk similarity index 96% rename from testing/himem_test/LibIncludes.mk rename to testing/arch/himem_test/LibIncludes.mk index 3ad3e8cedc2..5f404389c07 100644 --- a/testing/himem_test/LibIncludes.mk +++ b/testing/arch/himem_test/LibIncludes.mk @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/himem_test/LibIncludes.mk +# apps/testing/arch/himem_test/LibIncludes.mk # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/himem_test/Make.defs b/testing/arch/himem_test/Make.defs similarity index 91% rename from testing/himem_test/Make.defs rename to testing/arch/himem_test/Make.defs index 2e2b03d6378..8a692df3664 100644 --- a/testing/himem_test/Make.defs +++ b/testing/arch/himem_test/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/himem_test/Make.defs +# apps/testing/arch/himem_test/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -22,5 +22,5 @@ ifneq ($(CONFIG_TESTING_HIMEM_TEST),) -CONFIGURED_APPS += $(APPDIR)/testing/himem_test +CONFIGURED_APPS += $(APPDIR)/testing/arch/himem_test endif diff --git a/testing/himem_test/Makefile b/testing/arch/himem_test/Makefile similarity index 93% rename from testing/himem_test/Makefile rename to testing/arch/himem_test/Makefile index 76568df31f5..ae6ab8d83c2 100644 --- a/testing/himem_test/Makefile +++ b/testing/arch/himem_test/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/himem_test/Makefile +# apps/testing/arch/himem_test/Makefile # # SPDX-License-Identifier: Apache-2.0 # @@ -22,7 +22,7 @@ include $(APPDIR)/Make.defs -include $(APPDIR)/testing/himem_test/LibIncludes.mk +include $(APPDIR)/testing/arch/himem_test/LibIncludes.mk # built-in application info diff --git a/testing/himem_test/himem_chardev_test.c b/testing/arch/himem_test/himem_chardev_test.c similarity index 99% rename from testing/himem_test/himem_chardev_test.c rename to testing/arch/himem_test/himem_chardev_test.c index 118a9ca69e2..80c74e4656b 100644 --- a/testing/himem_test/himem_chardev_test.c +++ b/testing/arch/himem_test/himem_chardev_test.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/himem_test/himem_chardev_test.c + * apps/testing/arch/himem_test/himem_chardev_test.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/mtetest/CMakeLists.txt b/testing/arch/mtetest/CMakeLists.txt similarity index 96% rename from testing/mtetest/CMakeLists.txt rename to testing/arch/mtetest/CMakeLists.txt index fed326f2210..33d20d9131d 100644 --- a/testing/mtetest/CMakeLists.txt +++ b/testing/arch/mtetest/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/mtetest/CMakeLists.txt +# apps/testing/arch/mtetest/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/mtetest/Kconfig b/testing/arch/mtetest/Kconfig similarity index 100% rename from testing/mtetest/Kconfig rename to testing/arch/mtetest/Kconfig diff --git a/testing/mtetest/Make.defs b/testing/arch/mtetest/Make.defs similarity index 92% rename from testing/mtetest/Make.defs rename to testing/arch/mtetest/Make.defs index 94339a5ce1e..5e2717ee08a 100644 --- a/testing/mtetest/Make.defs +++ b/testing/arch/mtetest/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/mtetest/Make.defs +# apps/testing/arch/mtetest/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_MTE),) -CONFIGURED_APPS += $(APPDIR)/testing/mtetest +CONFIGURED_APPS += $(APPDIR)/testing/arch/mtetest endif diff --git a/testing/mtetest/Makefile b/testing/arch/mtetest/Makefile similarity index 96% rename from testing/mtetest/Makefile rename to testing/arch/mtetest/Makefile index 73599309f3d..22693446b1c 100644 --- a/testing/mtetest/Makefile +++ b/testing/arch/mtetest/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/mtetest/Makefile +# apps/testing/arch/mtetest/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/mtetest/mtetest.c b/testing/arch/mtetest/mtetest.c similarity index 99% rename from testing/mtetest/mtetest.c rename to testing/arch/mtetest/mtetest.c index ac2f0bf1a8f..b6df5357de3 100644 --- a/testing/mtetest/mtetest.c +++ b/testing/arch/mtetest/mtetest.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/mtetest/mtetest.c + * apps/testing/arch/mtetest/mtetest.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/x86-64-ABI/.gitignore b/testing/arch/x86-64-ABI/.gitignore similarity index 100% rename from testing/x86-64-ABI/.gitignore rename to testing/arch/x86-64-ABI/.gitignore diff --git a/testing/x86-64-ABI/0001-app-testing-Resolve-the-issue-of-compilation-failure.patch b/testing/arch/x86-64-ABI/0001-app-testing-Resolve-the-issue-of-compilation-failure.patch similarity index 100% rename from testing/x86-64-ABI/0001-app-testing-Resolve-the-issue-of-compilation-failure.patch rename to testing/arch/x86-64-ABI/0001-app-testing-Resolve-the-issue-of-compilation-failure.patch diff --git a/testing/x86-64-ABI/Kconfig b/testing/arch/x86-64-ABI/Kconfig similarity index 100% rename from testing/x86-64-ABI/Kconfig rename to testing/arch/x86-64-ABI/Kconfig diff --git a/testing/x86-64-ABI/Make.defs b/testing/arch/x86-64-ABI/Make.defs similarity index 91% rename from testing/x86-64-ABI/Make.defs rename to testing/arch/x86-64-ABI/Make.defs index 4c5f32cdd01..b37e54f9575 100644 --- a/testing/x86-64-ABI/Make.defs +++ b/testing/arch/x86-64-ABI/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/system/uorb/Make.defs +# apps/testing/arch/x86-64-ABI/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_X86_64_ABI),) -CONFIGURED_APPS += $(APPDIR)/testing/x86-64-ABI +CONFIGURED_APPS += $(APPDIR)/testing/arch/x86-64-ABI endif diff --git a/testing/x86-64-ABI/Makefile b/testing/arch/x86-64-ABI/Makefile similarity index 98% rename from testing/x86-64-ABI/Makefile rename to testing/arch/x86-64-ABI/Makefile index 927008f33c8..d5dea4abf5f 100644 --- a/testing/x86-64-ABI/Makefile +++ b/testing/arch/x86-64-ABI/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/x86-64-ABI/Makefile +# apps/testing/arch/x86-64-ABI/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/cxx/CMakeLists.txt b/testing/cxx/CMakeLists.txt new file mode 100644 index 00000000000..4a2f10a2096 --- /dev/null +++ b/testing/cxx/CMakeLists.txt @@ -0,0 +1,24 @@ +# ############################################################################## +# apps/testing/cxx/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 "cxx") diff --git a/testing/cxx/Make.defs b/testing/cxx/Make.defs new file mode 100644 index 00000000000..62a3e9f18ac --- /dev/null +++ b/testing/cxx/Make.defs @@ -0,0 +1,23 @@ +############################################################################ +# apps/testing/cxx/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/cxx/*/Make.defs) diff --git a/testing/cxx/Makefile b/testing/cxx/Makefile new file mode 100644 index 00000000000..28a4c2420e9 --- /dev/null +++ b/testing/cxx/Makefile @@ -0,0 +1,25 @@ +############################################################################ +# apps/testing/cxx/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 = "cxx" + +include $(APPDIR)/Directory.mk diff --git a/testing/cxxsize/CMakeLists.txt b/testing/cxx/cxxsize/CMakeLists.txt similarity index 96% rename from testing/cxxsize/CMakeLists.txt rename to testing/cxx/cxxsize/CMakeLists.txt index ddf8f43fd82..6fa2b7ab91f 100644 --- a/testing/cxxsize/CMakeLists.txt +++ b/testing/cxx/cxxsize/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/cxxsize/CMakeLists.txt +# apps/testing/cxx/cxxsize/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/cxxsize/Kconfig b/testing/cxx/cxxsize/Kconfig similarity index 100% rename from testing/cxxsize/Kconfig rename to testing/cxx/cxxsize/Kconfig diff --git a/testing/cxxsize/Make.defs b/testing/cxx/cxxsize/Make.defs similarity index 92% rename from testing/cxxsize/Make.defs rename to testing/cxx/cxxsize/Make.defs index 4b3c7cb95be..73798f27519 100644 --- a/testing/cxxsize/Make.defs +++ b/testing/cxx/cxxsize/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/cxxtest/Make.defs +# apps/testing/cxx/cxxtest/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_CXXSIZE),) -CONFIGURED_APPS += $(APPDIR)/testing/cxxsize +CONFIGURED_APPS += $(APPDIR)/testing/cxx/cxxsize endif diff --git a/testing/cxxsize/Makefile b/testing/cxx/cxxsize/Makefile similarity index 97% rename from testing/cxxsize/Makefile rename to testing/cxx/cxxsize/Makefile index 04560e0654f..59e57fd71b5 100644 --- a/testing/cxxsize/Makefile +++ b/testing/cxx/cxxsize/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/cxxtest/Makefile +# apps/testing/cxx/cxxtest/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/cxxsize/README.md b/testing/cxx/cxxsize/README.md similarity index 100% rename from testing/cxxsize/README.md rename to testing/cxx/cxxsize/README.md diff --git a/testing/cxxsize/array.cxx b/testing/cxx/cxxsize/array.cxx similarity index 98% rename from testing/cxxsize/array.cxx rename to testing/cxx/cxxsize/array.cxx index 6b4deb2cf4b..f3efca45ce8 100644 --- a/testing/cxxsize/array.cxx +++ b/testing/cxx/cxxsize/array.cxx @@ -1,5 +1,5 @@ //*************************************************************************** -// apps/testing/cxxsize/array.cxx +// apps/testing/cxx/cxxsize/array.cxx // // SPDX-License-Identifier: Apache-2.0 // diff --git a/testing/cxxsize/condition_variable.cxx b/testing/cxx/cxxsize/condition_variable.cxx similarity index 97% rename from testing/cxxsize/condition_variable.cxx rename to testing/cxx/cxxsize/condition_variable.cxx index a9ddf12883d..a094046d2ca 100644 --- a/testing/cxxsize/condition_variable.cxx +++ b/testing/cxx/cxxsize/condition_variable.cxx @@ -1,5 +1,5 @@ //*************************************************************************** -// apps/testing/cxxsize/condition_variable.cxx +// apps/testing/cxx/cxxsize/condition_variable.cxx // // SPDX-License-Identifier: Apache-2.0 // diff --git a/testing/cxxsize/deque.cxx b/testing/cxx/cxxsize/deque.cxx similarity index 98% rename from testing/cxxsize/deque.cxx rename to testing/cxx/cxxsize/deque.cxx index 2fbffc1bdc4..eb5d00c9df3 100644 --- a/testing/cxxsize/deque.cxx +++ b/testing/cxx/cxxsize/deque.cxx @@ -1,5 +1,5 @@ //*************************************************************************** -// apps/testing/cxxsize/deque.cxx +// apps/testing/cxx/cxxsize/deque.cxx // // SPDX-License-Identifier: Apache-2.0 // diff --git a/testing/cxxsize/exception.cxx b/testing/cxx/cxxsize/exception.cxx similarity index 98% rename from testing/cxxsize/exception.cxx rename to testing/cxx/cxxsize/exception.cxx index baa07dc80d4..83cf0dae753 100644 --- a/testing/cxxsize/exception.cxx +++ b/testing/cxx/cxxsize/exception.cxx @@ -1,5 +1,5 @@ //*************************************************************************** -// apps/testing/cxxsize/exception.cxx +// apps/testing/cxx/cxxsize/exception.cxx // // SPDX-License-Identifier: Apache-2.0 // diff --git a/testing/cxxsize/forward_list.cxx b/testing/cxx/cxxsize/forward_list.cxx similarity index 97% rename from testing/cxxsize/forward_list.cxx rename to testing/cxx/cxxsize/forward_list.cxx index 02512e35a45..577d8061a2e 100644 --- a/testing/cxxsize/forward_list.cxx +++ b/testing/cxx/cxxsize/forward_list.cxx @@ -1,5 +1,5 @@ //*************************************************************************** -// apps/testing/cxxsize/forward_list.cxx +// apps/testing/cxx/cxxsize/forward_list.cxx // // SPDX-License-Identifier: Apache-2.0 // diff --git a/testing/cxxsize/future.cxx b/testing/cxx/cxxsize/future.cxx similarity index 98% rename from testing/cxxsize/future.cxx rename to testing/cxx/cxxsize/future.cxx index 3ecb8cb093f..40d31b97966 100644 --- a/testing/cxxsize/future.cxx +++ b/testing/cxx/cxxsize/future.cxx @@ -1,5 +1,5 @@ //*************************************************************************** -// apps/testing/cxxsize/future.cxx +// apps/testing/cxx/cxxsize/future.cxx // // SPDX-License-Identifier: Apache-2.0 // diff --git a/testing/cxxsize/iostream.cxx b/testing/cxx/cxxsize/iostream.cxx similarity index 98% rename from testing/cxxsize/iostream.cxx rename to testing/cxx/cxxsize/iostream.cxx index 2b57140c387..396609c2c58 100644 --- a/testing/cxxsize/iostream.cxx +++ b/testing/cxx/cxxsize/iostream.cxx @@ -1,5 +1,5 @@ //*************************************************************************** -// apps/testing/cxxsize/iostream.cxx +// apps/testing/cxx/cxxsize/iostream.cxx // // SPDX-License-Identifier: Apache-2.0 // diff --git a/testing/cxxsize/list.cxx b/testing/cxx/cxxsize/list.cxx similarity index 98% rename from testing/cxxsize/list.cxx rename to testing/cxx/cxxsize/list.cxx index 9a83eca727d..76a4888c06e 100644 --- a/testing/cxxsize/list.cxx +++ b/testing/cxx/cxxsize/list.cxx @@ -1,5 +1,5 @@ //*************************************************************************** -// apps/testing/cxxsize/list.cxx +// apps/testing/cxx/cxxsize/list.cxx // // SPDX-License-Identifier: Apache-2.0 // diff --git a/testing/cxxsize/map.cxx b/testing/cxx/cxxsize/map.cxx similarity index 98% rename from testing/cxxsize/map.cxx rename to testing/cxx/cxxsize/map.cxx index f4c5cd09576..9c76e04f191 100644 --- a/testing/cxxsize/map.cxx +++ b/testing/cxx/cxxsize/map.cxx @@ -1,5 +1,5 @@ //*************************************************************************** -// apps/testing/cxxsize/map.cxx +// apps/testing/cxx/cxxsize/map.cxx // // SPDX-License-Identifier: Apache-2.0 // diff --git a/testing/cxxsize/multiset.cxx b/testing/cxx/cxxsize/multiset.cxx similarity index 98% rename from testing/cxxsize/multiset.cxx rename to testing/cxx/cxxsize/multiset.cxx index a859ec214c2..c7413814304 100644 --- a/testing/cxxsize/multiset.cxx +++ b/testing/cxx/cxxsize/multiset.cxx @@ -1,5 +1,5 @@ //*************************************************************************** -// apps/testing/cxxsize/multiset.cxx +// apps/testing/cxx/cxxsize/multiset.cxx // // SPDX-License-Identifier: Apache-2.0 // diff --git a/testing/cxxsize/mutex.cxx b/testing/cxx/cxxsize/mutex.cxx similarity index 98% rename from testing/cxxsize/mutex.cxx rename to testing/cxx/cxxsize/mutex.cxx index 4d7b5162db9..e16fc044edf 100644 --- a/testing/cxxsize/mutex.cxx +++ b/testing/cxx/cxxsize/mutex.cxx @@ -1,5 +1,5 @@ //*************************************************************************** -// apps/testing/cxxsize/mutex.cxx +// apps/testing/cxx/cxxsize/mutex.cxx // // SPDX-License-Identifier: Apache-2.0 // diff --git a/testing/cxxsize/rtti.cxx b/testing/cxx/cxxsize/rtti.cxx similarity index 98% rename from testing/cxxsize/rtti.cxx rename to testing/cxx/cxxsize/rtti.cxx index 39590e92578..2935267c101 100644 --- a/testing/cxxsize/rtti.cxx +++ b/testing/cxx/cxxsize/rtti.cxx @@ -1,5 +1,5 @@ //*************************************************************************** -// apps/testing/cxxsize/rtti.cxx +// apps/testing/cxx/cxxsize/rtti.cxx // // SPDX-License-Identifier: Apache-2.0 // diff --git a/testing/cxxsize/semaphore.cxx b/testing/cxx/cxxsize/semaphore.cxx similarity index 97% rename from testing/cxxsize/semaphore.cxx rename to testing/cxx/cxxsize/semaphore.cxx index a1b3a29a8cc..cf716f536c6 100644 --- a/testing/cxxsize/semaphore.cxx +++ b/testing/cxx/cxxsize/semaphore.cxx @@ -1,5 +1,5 @@ //*************************************************************************** -// apps/testing/cxxsize/semaphore.cxx +// apps/testing/cxx/cxxsize/semaphore.cxx // // SPDX-License-Identifier: Apache-2.0 // diff --git a/testing/cxxsize/set.cxx b/testing/cxx/cxxsize/set.cxx similarity index 98% rename from testing/cxxsize/set.cxx rename to testing/cxx/cxxsize/set.cxx index 1285a12fbfc..4ed94f55d12 100644 --- a/testing/cxxsize/set.cxx +++ b/testing/cxx/cxxsize/set.cxx @@ -1,5 +1,5 @@ //*************************************************************************** -// apps/testing/cxxsize/set.cxx +// apps/testing/cxx/cxxsize/set.cxx // // SPDX-License-Identifier: Apache-2.0 // diff --git a/testing/cxxsize/shared_ptr.cxx b/testing/cxx/cxxsize/shared_ptr.cxx similarity index 98% rename from testing/cxxsize/shared_ptr.cxx rename to testing/cxx/cxxsize/shared_ptr.cxx index 9e519e11a16..b365daaea36 100644 --- a/testing/cxxsize/shared_ptr.cxx +++ b/testing/cxx/cxxsize/shared_ptr.cxx @@ -1,5 +1,5 @@ //*************************************************************************** -// apps/testing/cxxsize/shared_ptr.cxx +// apps/testing/cxx/cxxsize/shared_ptr.cxx // // SPDX-License-Identifier: Apache-2.0 // diff --git a/testing/cxxsize/string.cxx b/testing/cxx/cxxsize/string.cxx similarity index 98% rename from testing/cxxsize/string.cxx rename to testing/cxx/cxxsize/string.cxx index 04988820fd0..b77ec45f25f 100644 --- a/testing/cxxsize/string.cxx +++ b/testing/cxx/cxxsize/string.cxx @@ -1,5 +1,5 @@ //*************************************************************************** -// apps/testing/cxxsize/string.cxx +// apps/testing/cxx/cxxsize/string.cxx // // SPDX-License-Identifier: Apache-2.0 // diff --git a/testing/cxxsize/string_view.cxx b/testing/cxx/cxxsize/string_view.cxx similarity index 97% rename from testing/cxxsize/string_view.cxx rename to testing/cxx/cxxsize/string_view.cxx index c415262d064..fd9a69c3e72 100644 --- a/testing/cxxsize/string_view.cxx +++ b/testing/cxx/cxxsize/string_view.cxx @@ -1,5 +1,5 @@ //*************************************************************************** -// apps/testing/cxxsize/string_view.cxx +// apps/testing/cxx/cxxsize/string_view.cxx // // SPDX-License-Identifier: Apache-2.0 // diff --git a/testing/cxxsize/thread.cxx b/testing/cxx/cxxsize/thread.cxx similarity index 98% rename from testing/cxxsize/thread.cxx rename to testing/cxx/cxxsize/thread.cxx index e646c22eb2e..7a8902157ec 100644 --- a/testing/cxxsize/thread.cxx +++ b/testing/cxx/cxxsize/thread.cxx @@ -1,5 +1,5 @@ //*************************************************************************** -// apps/testing/cxxsize/thread.cxx +// apps/testing/cxx/cxxsize/thread.cxx // // SPDX-License-Identifier: Apache-2.0 // diff --git a/testing/cxxsize/unordered_map.cxx b/testing/cxx/cxxsize/unordered_map.cxx similarity index 97% rename from testing/cxxsize/unordered_map.cxx rename to testing/cxx/cxxsize/unordered_map.cxx index 2d604070116..aa8979aff6f 100644 --- a/testing/cxxsize/unordered_map.cxx +++ b/testing/cxx/cxxsize/unordered_map.cxx @@ -1,5 +1,5 @@ //*************************************************************************** -// apps/testing/cxxsize/unordered_map.cxx +// apps/testing/cxx/cxxsize/unordered_map.cxx // // SPDX-License-Identifier: Apache-2.0 // diff --git a/testing/cxxsize/unordered_multimap.cxx b/testing/cxx/cxxsize/unordered_multimap.cxx similarity index 97% rename from testing/cxxsize/unordered_multimap.cxx rename to testing/cxx/cxxsize/unordered_multimap.cxx index 153b5f60a7a..0c4fcfdfaf8 100644 --- a/testing/cxxsize/unordered_multimap.cxx +++ b/testing/cxx/cxxsize/unordered_multimap.cxx @@ -1,5 +1,5 @@ //*************************************************************************** -// apps/testing/cxxsize/unordered_multimap.cxx +// apps/testing/cxx/cxxsize/unordered_multimap.cxx // // SPDX-License-Identifier: Apache-2.0 // diff --git a/testing/cxxsize/unordered_multiset.cxx b/testing/cxx/cxxsize/unordered_multiset.cxx similarity index 97% rename from testing/cxxsize/unordered_multiset.cxx rename to testing/cxx/cxxsize/unordered_multiset.cxx index f19ae3fcbba..a35a3a9c9c5 100644 --- a/testing/cxxsize/unordered_multiset.cxx +++ b/testing/cxx/cxxsize/unordered_multiset.cxx @@ -1,5 +1,5 @@ //*************************************************************************** -// apps/testing/cxxsize/unordered_multiset.cxx +// apps/testing/cxx/cxxsize/unordered_multiset.cxx // // SPDX-License-Identifier: Apache-2.0 // diff --git a/testing/cxxsize/unordered_set.cxx b/testing/cxx/cxxsize/unordered_set.cxx similarity index 97% rename from testing/cxxsize/unordered_set.cxx rename to testing/cxx/cxxsize/unordered_set.cxx index c5b606509e7..95940676484 100644 --- a/testing/cxxsize/unordered_set.cxx +++ b/testing/cxx/cxxsize/unordered_set.cxx @@ -1,5 +1,5 @@ //*************************************************************************** -// apps/testing/cxxsize/unordered_set.cxx +// apps/testing/cxx/cxxsize/unordered_set.cxx // // SPDX-License-Identifier: Apache-2.0 // diff --git a/testing/cxxsize/vector.cxx b/testing/cxx/cxxsize/vector.cxx similarity index 98% rename from testing/cxxsize/vector.cxx rename to testing/cxx/cxxsize/vector.cxx index 5f916d928ec..a40299d868d 100644 --- a/testing/cxxsize/vector.cxx +++ b/testing/cxx/cxxsize/vector.cxx @@ -1,5 +1,5 @@ //*************************************************************************** -// apps/testing/cxxsize/vector.cxx +// apps/testing/cxx/cxxsize/vector.cxx // // SPDX-License-Identifier: Apache-2.0 // diff --git a/testing/cxxsize/weak_ptr.cxx b/testing/cxx/cxxsize/weak_ptr.cxx similarity index 98% rename from testing/cxxsize/weak_ptr.cxx rename to testing/cxx/cxxsize/weak_ptr.cxx index 1ccd95bd2b7..65a5625652e 100644 --- a/testing/cxxsize/weak_ptr.cxx +++ b/testing/cxx/cxxsize/weak_ptr.cxx @@ -1,5 +1,5 @@ //*************************************************************************** -// apps/testing/cxxsize/weak_ptr.cxx +// apps/testing/cxx/cxxsize/weak_ptr.cxx // // SPDX-License-Identifier: Apache-2.0 // diff --git a/testing/cxxtest/CMakeLists.txt b/testing/cxx/cxxtest/CMakeLists.txt similarity index 96% rename from testing/cxxtest/CMakeLists.txt rename to testing/cxx/cxxtest/CMakeLists.txt index 962b7f09798..323e112b882 100644 --- a/testing/cxxtest/CMakeLists.txt +++ b/testing/cxx/cxxtest/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/cxxtest/CMakeLists.txt +# apps/testing/cxx/cxxtest/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/cxxtest/Kconfig b/testing/cxx/cxxtest/Kconfig similarity index 100% rename from testing/cxxtest/Kconfig rename to testing/cxx/cxxtest/Kconfig diff --git a/testing/cxxtest/Make.defs b/testing/cxx/cxxtest/Make.defs similarity index 92% rename from testing/cxxtest/Make.defs rename to testing/cxx/cxxtest/Make.defs index 5a06bbbf901..b50f6a9137f 100644 --- a/testing/cxxtest/Make.defs +++ b/testing/cxx/cxxtest/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/cxxtest/Make.defs +# apps/testing/cxx/cxxtest/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_CXXTEST),) -CONFIGURED_APPS += $(APPDIR)/testing/cxxtest +CONFIGURED_APPS += $(APPDIR)/testing/cxx/cxxtest endif diff --git a/testing/cxxtest/Makefile b/testing/cxx/cxxtest/Makefile similarity index 97% rename from testing/cxxtest/Makefile rename to testing/cxx/cxxtest/Makefile index 5690c59f9e4..2c7d7244e02 100644 --- a/testing/cxxtest/Makefile +++ b/testing/cxx/cxxtest/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/cxxtest/Makefile +# apps/testing/cxx/cxxtest/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/cxxtest/cxxtest_main.cxx b/testing/cxx/cxxtest/cxxtest_main.cxx similarity index 99% rename from testing/cxxtest/cxxtest_main.cxx rename to testing/cxx/cxxtest/cxxtest_main.cxx index 48e0d014187..f33da9eed28 100644 --- a/testing/cxxtest/cxxtest_main.cxx +++ b/testing/cxx/cxxtest/cxxtest_main.cxx @@ -1,5 +1,5 @@ //*************************************************************************** -// apps/testing/cxxtest/cxxtest_main.cxx +// apps/testing/cxx/cxxtest/cxxtest_main.cxx // // SPDX-License-Identifier: Apache-2.0 // diff --git a/testing/uclibcxx_test/Kconfig b/testing/cxx/uclibcxx_test/Kconfig similarity index 100% rename from testing/uclibcxx_test/Kconfig rename to testing/cxx/uclibcxx_test/Kconfig diff --git a/testing/uclibcxx_test/Make.defs b/testing/cxx/uclibcxx_test/Make.defs similarity index 91% rename from testing/uclibcxx_test/Make.defs rename to testing/cxx/uclibcxx_test/Make.defs index 2b995217380..a5d5f455ba2 100644 --- a/testing/uclibcxx_test/Make.defs +++ b/testing/cxx/uclibcxx_test/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/uclibcxx_test/Make.defs +# apps/testing/cxx/uclibcxx_test/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_UCLIBCXXTEST),) -CONFIGURED_APPS += $(APPDIR)/testing/uclibcxx_test +CONFIGURED_APPS += $(APPDIR)/testing//cxx/uclibcxx_test endif diff --git a/testing/uclibcxx_test/Makefile b/testing/cxx/uclibcxx_test/Makefile similarity index 97% rename from testing/uclibcxx_test/Makefile rename to testing/cxx/uclibcxx_test/Makefile index 464d7b8fec2..88d960aef30 100644 --- a/testing/uclibcxx_test/Makefile +++ b/testing/cxx/uclibcxx_test/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/uclibcxx_test/Makefile +# apps/testing/cxx/uclibcxx_test/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/driver/CMakeLists.txt b/testing/driver/CMakeLists.txt new file mode 100644 index 00000000000..af687decb61 --- /dev/null +++ b/testing/driver/CMakeLists.txt @@ -0,0 +1,24 @@ +# ############################################################################## +# apps/testing/driver/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 "driver") diff --git a/testing/driver/Make.defs b/testing/driver/Make.defs new file mode 100644 index 00000000000..bfcc82f7bb6 --- /dev/null +++ b/testing/driver/Make.defs @@ -0,0 +1,23 @@ +############################################################################ +# apps/testing/driver/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/driver/*/Make.defs) diff --git a/testing/driver/Makefile b/testing/driver/Makefile new file mode 100644 index 00000000000..0adb20c0fa4 --- /dev/null +++ b/testing/driver/Makefile @@ -0,0 +1,25 @@ +############################################################################ +# apps/testing/driver/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 = "dirver" + +include $(APPDIR)/Directory.mk diff --git a/testing/drivertest/CMakeLists.txt b/testing/driver/drivertest/CMakeLists.txt similarity index 99% rename from testing/drivertest/CMakeLists.txt rename to testing/driver/drivertest/CMakeLists.txt index a3add4dca40..07d8ef15c1c 100644 --- a/testing/drivertest/CMakeLists.txt +++ b/testing/driver/drivertest/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/drivertest/CMakeLists.txt +# apps/testing/driver/drivertest/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/drivertest/Kconfig b/testing/driver/drivertest/Kconfig similarity index 100% rename from testing/drivertest/Kconfig rename to testing/driver/drivertest/Kconfig diff --git a/testing/drivertest/Make.defs b/testing/driver/drivertest/Make.defs similarity index 91% rename from testing/drivertest/Make.defs rename to testing/driver/drivertest/Make.defs index a68b7e050e6..dcdc56eb473 100644 --- a/testing/drivertest/Make.defs +++ b/testing/driver/drivertest/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/drivertest/Make.defs +# apps/testing/driver/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/driver/drivertest endif diff --git a/testing/drivertest/Makefile b/testing/driver/drivertest/Makefile similarity index 98% rename from testing/drivertest/Makefile rename to testing/driver/drivertest/Makefile index aa25dfa8381..fb23acd342f 100644 --- a/testing/drivertest/Makefile +++ b/testing/driver/drivertest/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/drivertest/Makefile +# apps/testing/driver/drivertest/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/drivertest/drivertest_adc.c b/testing/driver/drivertest/drivertest_adc.c similarity index 99% rename from testing/drivertest/drivertest_adc.c rename to testing/driver/drivertest/drivertest_adc.c index 267ed770ac4..19ee3da3d49 100644 --- a/testing/drivertest/drivertest_adc.c +++ b/testing/driver/drivertest/drivertest_adc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/drivertest/drivertest_adc.c + * apps/testing/driver/drivertest/drivertest_adc.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/drivertest/drivertest_audio.c b/testing/driver/drivertest/drivertest_audio.c similarity index 99% rename from testing/drivertest/drivertest_audio.c rename to testing/driver/drivertest/drivertest_audio.c index 2f019fcdd32..fd4df69abdd 100644 --- a/testing/drivertest/drivertest_audio.c +++ b/testing/driver/drivertest/drivertest_audio.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/drivertest/drivertest_audio.c + * apps/testing/driver/drivertest/drivertest_audio.c * * SPDX-License-Identifier: Apache-2.0 * @@ -481,7 +481,7 @@ static bool audio_test_timeout(FAR struct audio_state_s *state, gettimeofday(&now, NULL); timersub(&now, &start, &delta); - return timercmp(&delta, &wait, >); + return timercmp(&delta, &wait, > /* For checkpatch */); } static int audio_test_stop(FAR struct audio_state_s *state, int direction) diff --git a/testing/drivertest/drivertest_block.c b/testing/driver/drivertest/drivertest_block.c similarity index 99% rename from testing/drivertest/drivertest_block.c rename to testing/driver/drivertest/drivertest_block.c index daa655378d2..a5c5624dc3f 100644 --- a/testing/drivertest/drivertest_block.c +++ b/testing/driver/drivertest/drivertest_block.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/drivertest/drivertest_block.c + * apps/testing/driver/drivertest/drivertest_block.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/drivertest/drivertest_framebuffer.c b/testing/driver/drivertest/drivertest_framebuffer.c similarity index 99% rename from testing/drivertest/drivertest_framebuffer.c rename to testing/driver/drivertest/drivertest_framebuffer.c index 03edb568033..650130b5163 100644 --- a/testing/drivertest/drivertest_framebuffer.c +++ b/testing/driver/drivertest/drivertest_framebuffer.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/drivertest/drivertest_framebuffer.c + * apps/testing/driver/drivertest/drivertest_framebuffer.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/drivertest/drivertest_gpio.c b/testing/driver/drivertest/drivertest_gpio.c similarity index 99% rename from testing/drivertest/drivertest_gpio.c rename to testing/driver/drivertest/drivertest_gpio.c index a84acf20dcf..7175d6e4f6f 100644 --- a/testing/drivertest/drivertest_gpio.c +++ b/testing/driver/drivertest/drivertest_gpio.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/drivertest/drivertest_gpio.c + * apps/testing/driver/drivertest/drivertest_gpio.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/drivertest/drivertest_i2c_read.c b/testing/driver/drivertest/drivertest_i2c_read.c similarity index 99% rename from testing/drivertest/drivertest_i2c_read.c rename to testing/driver/drivertest/drivertest_i2c_read.c index 9e87b0bdf56..7afdc642ba2 100644 --- a/testing/drivertest/drivertest_i2c_read.c +++ b/testing/driver/drivertest/drivertest_i2c_read.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/drivertest/drivertest_i2c_read.c + * apps/testing/driver/drivertest/drivertest_i2c_read.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/drivertest/drivertest_i2c_spi.c b/testing/driver/drivertest/drivertest_i2c_spi.c similarity index 99% rename from testing/drivertest/drivertest_i2c_spi.c rename to testing/driver/drivertest/drivertest_i2c_spi.c index 1faaef177a5..d8939526e72 100644 --- a/testing/drivertest/drivertest_i2c_spi.c +++ b/testing/driver/drivertest/drivertest_i2c_spi.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/drivertest/drivertest_i2c_spi.c + * apps/testing/driver/drivertest/drivertest_i2c_spi.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/drivertest/drivertest_i2c_write.c b/testing/driver/drivertest/drivertest_i2c_write.c similarity index 99% rename from testing/drivertest/drivertest_i2c_write.c rename to testing/driver/drivertest/drivertest_i2c_write.c index 959e8b62fcd..0198699bf99 100644 --- a/testing/drivertest/drivertest_i2c_write.c +++ b/testing/driver/drivertest/drivertest_i2c_write.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/drivertest/drivertest_i2c_write.c + * apps/testing/driver/drivertest/drivertest_i2c_write.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/drivertest/drivertest_lcd.c b/testing/driver/drivertest/drivertest_lcd.c similarity index 99% rename from testing/drivertest/drivertest_lcd.c rename to testing/driver/drivertest/drivertest_lcd.c index 22195b8bfb3..e13da0d0e50 100644 --- a/testing/drivertest/drivertest_lcd.c +++ b/testing/driver/drivertest/drivertest_lcd.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/drivertest/drivertest_lcd.c + * apps/testing/driver/drivertest/drivertest_lcd.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/drivertest/drivertest_mps2.c b/testing/driver/drivertest/drivertest_mps2.c similarity index 99% rename from testing/drivertest/drivertest_mps2.c rename to testing/driver/drivertest/drivertest_mps2.c index 7ccbc1f2142..bc95cbdcd8f 100644 --- a/testing/drivertest/drivertest_mps2.c +++ b/testing/driver/drivertest/drivertest_mps2.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/drivertest/drivertest_mps2.c + * apps/testing/driver/drivertest/drivertest_mps2.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/drivertest/drivertest_mps2_isr_signal.c b/testing/driver/drivertest/drivertest_mps2_isr_signal.c similarity index 98% rename from testing/drivertest/drivertest_mps2_isr_signal.c rename to testing/driver/drivertest/drivertest_mps2_isr_signal.c index 5157b679a35..99ce0aaa8c0 100644 --- a/testing/drivertest/drivertest_mps2_isr_signal.c +++ b/testing/driver/drivertest/drivertest_mps2_isr_signal.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/drivertest/drivertest_mps2_isr_signal.c + * apps/testing/driver/drivertest/drivertest_mps2_isr_signal.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/drivertest/drivertest_mps2_zerointerrupt.c b/testing/driver/drivertest/drivertest_mps2_zerointerrupt.c similarity index 99% rename from testing/drivertest/drivertest_mps2_zerointerrupt.c rename to testing/driver/drivertest/drivertest_mps2_zerointerrupt.c index 852404dec5d..b4f4807104d 100644 --- a/testing/drivertest/drivertest_mps2_zerointerrupt.c +++ b/testing/driver/drivertest/drivertest_mps2_zerointerrupt.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/drivertest/drivertest_mps2_zerointerrupt.c + * apps/testing/driver/drivertest/drivertest_mps2_zerointerrupt.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/drivertest/drivertest_oneshot.c b/testing/driver/drivertest/drivertest_oneshot.c similarity index 99% rename from testing/drivertest/drivertest_oneshot.c rename to testing/driver/drivertest/drivertest_oneshot.c index 6d7afcc75ca..d3bc90c04a0 100644 --- a/testing/drivertest/drivertest_oneshot.c +++ b/testing/driver/drivertest/drivertest_oneshot.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/drivertest/drivertest_oneshot.c + * apps/testing/driver/drivertest/drivertest_oneshot.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/drivertest/drivertest_pm.c b/testing/driver/drivertest/drivertest_pm.c similarity index 99% rename from testing/drivertest/drivertest_pm.c rename to testing/driver/drivertest/drivertest_pm.c index fc8ee4bdc38..a26d1548120 100644 --- a/testing/drivertest/drivertest_pm.c +++ b/testing/driver/drivertest/drivertest_pm.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/drivertest/drivertest_pm.c + * apps/testing/driver/drivertest/drivertest_pm.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/drivertest/drivertest_pm_runtime.c b/testing/driver/drivertest/drivertest_pm_runtime.c similarity index 99% rename from testing/drivertest/drivertest_pm_runtime.c rename to testing/driver/drivertest/drivertest_pm_runtime.c index a0db9947c9f..94c674fb8eb 100644 --- a/testing/drivertest/drivertest_pm_runtime.c +++ b/testing/driver/drivertest/drivertest_pm_runtime.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/drivertest/drivertest_pm_runtime.c + * apps/testing/driver/drivertest/drivertest_pm_runtime.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/drivertest/drivertest_pm_smp.c b/testing/driver/drivertest/drivertest_pm_smp.c similarity index 99% rename from testing/drivertest/drivertest_pm_smp.c rename to testing/driver/drivertest/drivertest_pm_smp.c index 6edbb66948a..a269dc3beae 100644 --- a/testing/drivertest/drivertest_pm_smp.c +++ b/testing/driver/drivertest/drivertest_pm_smp.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/drivertest/drivertest_pm_smp.c + * apps/testing/driver/drivertest/drivertest_pm_smp.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/drivertest/drivertest_posix_timer.c b/testing/driver/drivertest/drivertest_posix_timer.c similarity index 99% rename from testing/drivertest/drivertest_posix_timer.c rename to testing/driver/drivertest/drivertest_posix_timer.c index b52b1887de1..96d63da2ac3 100644 --- a/testing/drivertest/drivertest_posix_timer.c +++ b/testing/driver/drivertest/drivertest_posix_timer.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/drivertest/drivertest_posix_timer.c + * apps/testing/driver/drivertest/drivertest_posix_timer.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/drivertest/drivertest_pwm.c b/testing/driver/drivertest/drivertest_pwm.c similarity index 99% rename from testing/drivertest/drivertest_pwm.c rename to testing/driver/drivertest/drivertest_pwm.c index 18475184d5e..df4d4429f75 100644 --- a/testing/drivertest/drivertest_pwm.c +++ b/testing/driver/drivertest/drivertest_pwm.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/drivertest/drivertest_pwm.c + * apps/testing/driver/drivertest/drivertest_pwm.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/drivertest/drivertest_regulator.c b/testing/driver/drivertest/drivertest_regulator.c similarity index 99% rename from testing/drivertest/drivertest_regulator.c rename to testing/driver/drivertest/drivertest_regulator.c index bff19677c6e..497cdff8cea 100644 --- a/testing/drivertest/drivertest_regulator.c +++ b/testing/driver/drivertest/drivertest_regulator.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/drivertest/drivertest_regulator.c + * apps/testing/driver/drivertest/drivertest_regulator.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/drivertest/drivertest_relay.c b/testing/driver/drivertest/drivertest_relay.c similarity index 99% rename from testing/drivertest/drivertest_relay.c rename to testing/driver/drivertest/drivertest_relay.c index 7a1671f88fc..10b71d4f250 100644 --- a/testing/drivertest/drivertest_relay.c +++ b/testing/driver/drivertest/drivertest_relay.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/drivertest/drivertest_relay.c + * apps/testing/driver/drivertest/drivertest_relay.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/drivertest/drivertest_rtc.c b/testing/driver/drivertest/drivertest_rtc.c similarity index 99% rename from testing/drivertest/drivertest_rtc.c rename to testing/driver/drivertest/drivertest_rtc.c index 53ed2a5d11f..ac339ae82ed 100644 --- a/testing/drivertest/drivertest_rtc.c +++ b/testing/driver/drivertest/drivertest_rtc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/drivertest/drivertest_rtc.c + * apps/testing/driver/drivertest/drivertest_rtc.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/drivertest/drivertest_simple.c b/testing/driver/drivertest/drivertest_simple.c similarity index 97% rename from testing/drivertest/drivertest_simple.c rename to testing/driver/drivertest/drivertest_simple.c index 485b592e203..37a34ca9884 100644 --- a/testing/drivertest/drivertest_simple.c +++ b/testing/driver/drivertest/drivertest_simple.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/drivertest/drivertest_simple.c + * apps/testing/driver/drivertest/drivertest_simple.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/drivertest/drivertest_timer.c b/testing/driver/drivertest/drivertest_timer.c similarity index 99% rename from testing/drivertest/drivertest_timer.c rename to testing/driver/drivertest/drivertest_timer.c index 4478eda0f4e..2dc5fbc9bae 100644 --- a/testing/drivertest/drivertest_timer.c +++ b/testing/driver/drivertest/drivertest_timer.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/drivertest/drivertest_timer.c + * apps/testing/driver/drivertest/drivertest_timer.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/drivertest/drivertest_touchpanel.c b/testing/driver/drivertest/drivertest_touchpanel.c similarity index 99% rename from testing/drivertest/drivertest_touchpanel.c rename to testing/driver/drivertest/drivertest_touchpanel.c index 9f0255ec6ce..bf7248a2692 100644 --- a/testing/drivertest/drivertest_touchpanel.c +++ b/testing/driver/drivertest/drivertest_touchpanel.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/drivertest/drivertest_touchpanel.c + * apps/testing/driver/drivertest/drivertest_touchpanel.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/drivertest/drivertest_uart.c b/testing/driver/drivertest/drivertest_uart.c similarity index 99% rename from testing/drivertest/drivertest_uart.c rename to testing/driver/drivertest/drivertest_uart.c index cbe127b7c77..ac0c3050a23 100644 --- a/testing/drivertest/drivertest_uart.c +++ b/testing/driver/drivertest/drivertest_uart.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/drivertest/drivertest_uart.c + * apps/testing/driver/drivertest/drivertest_uart.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/drivertest/drivertest_watchdog.c b/testing/driver/drivertest/drivertest_watchdog.c similarity index 99% rename from testing/drivertest/drivertest_watchdog.c rename to testing/driver/drivertest/drivertest_watchdog.c index 8efa41eb2b2..5377210e3d4 100644 --- a/testing/drivertest/drivertest_watchdog.c +++ b/testing/driver/drivertest/drivertest_watchdog.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/drivertest/drivertest_watchdog.c + * apps/testing/driver/drivertest/drivertest_watchdog.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/drivertest/test_content_gen.py b/testing/driver/drivertest/test_content_gen.py similarity index 98% rename from testing/drivertest/test_content_gen.py rename to testing/driver/drivertest/test_content_gen.py index 3045252d1e9..71276d1e4d1 100644 --- a/testing/drivertest/test_content_gen.py +++ b/testing/driver/drivertest/test_content_gen.py @@ -1,6 +1,6 @@ #!/bin/python3 ############################################################################# -# apps/testing/drivertest/cmocka_driver_uart/test_content_gen.py +# apps/testing/driver/drivertest/cmocka_driver_uart/test_content_gen.py # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/fftest/CMakeLists.txt b/testing/driver/fftest/CMakeLists.txt similarity index 96% rename from testing/fftest/CMakeLists.txt rename to testing/driver/fftest/CMakeLists.txt index 77513c6012b..22d2a951aec 100644 --- a/testing/fftest/CMakeLists.txt +++ b/testing/driver/fftest/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/fftest/CMakeLists.txt +# apps/testing/driver/fftest/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/fftest/Kconfig b/testing/driver/fftest/Kconfig similarity index 100% rename from testing/fftest/Kconfig rename to testing/driver/fftest/Kconfig diff --git a/testing/fftest/Make.defs b/testing/driver/fftest/Make.defs similarity index 91% rename from testing/fftest/Make.defs rename to testing/driver/fftest/Make.defs index 0190fb4f21e..94c8012c1f2 100644 --- a/testing/fftest/Make.defs +++ b/testing/driver/fftest/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/fftest/Make.defs +# apps/testing/driver/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/driver/fftest endif diff --git a/testing/fftest/Makefile b/testing/driver/fftest/Makefile similarity index 96% rename from testing/fftest/Makefile rename to testing/driver/fftest/Makefile index 981d502f136..7fa704cb834 100644 --- a/testing/fftest/Makefile +++ b/testing/driver/fftest/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/fftest/Makefile +# apps/testing/driver/fftest/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/fftest/fftest.c b/testing/driver/fftest/fftest.c similarity index 99% rename from testing/fftest/fftest.c rename to testing/driver/fftest/fftest.c index 51700914ab9..8e70ac947b2 100644 --- a/testing/fftest/fftest.c +++ b/testing/driver/fftest/fftest.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/fftest/fftest.c + * apps/testing/driver/fftest/fftest.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/irtest/CMakeLists.txt b/testing/driver/irtest/CMakeLists.txt similarity index 96% rename from testing/irtest/CMakeLists.txt rename to testing/driver/irtest/CMakeLists.txt index 6975046ff2f..ea4b5e3f782 100644 --- a/testing/irtest/CMakeLists.txt +++ b/testing/driver/irtest/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/irtest/CMakeLists.txt +# apps/testing/driver/irtest/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/irtest/Kconfig b/testing/driver/irtest/Kconfig similarity index 100% rename from testing/irtest/Kconfig rename to testing/driver/irtest/Kconfig diff --git a/testing/irtest/Make.defs b/testing/driver/irtest/Make.defs similarity index 91% rename from testing/irtest/Make.defs rename to testing/driver/irtest/Make.defs index 4bd5f37e7da..1293cc835b6 100644 --- a/testing/irtest/Make.defs +++ b/testing/driver/irtest/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/irtest/Make.defs +# apps/testing/driver/irtest/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_IRTEST),) -CONFIGURED_APPS += $(APPDIR)/testing/irtest +CONFIGURED_APPS += $(APPDIR)/testing/driver/irtest endif diff --git a/testing/irtest/Makefile b/testing/driver/irtest/Makefile similarity index 97% rename from testing/irtest/Makefile rename to testing/driver/irtest/Makefile index 28d7b20c11d..17644b2ba9f 100644 --- a/testing/irtest/Makefile +++ b/testing/driver/irtest/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/irtest/Makefile +# apps/testing/driver/irtest/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/irtest/cmd.cxx b/testing/driver/irtest/cmd.cxx similarity index 99% rename from testing/irtest/cmd.cxx rename to testing/driver/irtest/cmd.cxx index 867864a47b0..0d2ad109cc6 100644 --- a/testing/irtest/cmd.cxx +++ b/testing/driver/irtest/cmd.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/irtest/cmd.cxx + * apps/testing/driver/irtest/cmd.cxx * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/irtest/cmd.hpp b/testing/driver/irtest/cmd.hpp similarity index 99% rename from testing/irtest/cmd.hpp rename to testing/driver/irtest/cmd.hpp index d1f96fcdf74..ffbed1e7c5e 100644 --- a/testing/irtest/cmd.hpp +++ b/testing/driver/irtest/cmd.hpp @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/irtest/cmd.hpp + * apps/testing/driver/irtest/cmd.hpp * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/irtest/enum.cxx b/testing/driver/irtest/enum.cxx similarity index 98% rename from testing/irtest/enum.cxx rename to testing/driver/irtest/enum.cxx index 1c3b58afdf4..19da66e3462 100644 --- a/testing/irtest/enum.cxx +++ b/testing/driver/irtest/enum.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/irtest/enum.cxx + * apps/testing/driver/irtest/enum.cxx * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/irtest/enum.hpp b/testing/driver/irtest/enum.hpp similarity index 98% rename from testing/irtest/enum.hpp rename to testing/driver/irtest/enum.hpp index 77c7120216b..1ffda9c79f4 100644 --- a/testing/irtest/enum.hpp +++ b/testing/driver/irtest/enum.hpp @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/irtest/enum.hpp + * apps/testing/driver/irtest/enum.hpp * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/irtest/main.cxx b/testing/driver/irtest/main.cxx similarity index 98% rename from testing/irtest/main.cxx rename to testing/driver/irtest/main.cxx index 9ea7a144745..3730eef6687 100644 --- a/testing/irtest/main.cxx +++ b/testing/driver/irtest/main.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/irtest/main.cxx + * apps/testing/driver/irtest/main.cxx * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/monkey/CMakeLists.txt b/testing/driver/monkey/CMakeLists.txt similarity index 96% rename from testing/monkey/CMakeLists.txt rename to testing/driver/monkey/CMakeLists.txt index d3649c24f90..50cb6f3613b 100644 --- a/testing/monkey/CMakeLists.txt +++ b/testing/driver/monkey/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/monkey/CMakeLists.txt +# apps/testing/driver/monkey/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/monkey/Kconfig b/testing/driver/monkey/Kconfig similarity index 100% rename from testing/monkey/Kconfig rename to testing/driver/monkey/Kconfig diff --git a/testing/monkey/Make.defs b/testing/driver/monkey/Make.defs similarity index 91% rename from testing/monkey/Make.defs rename to testing/driver/monkey/Make.defs index dbad681de85..68a2c64ebf3 100644 --- a/testing/monkey/Make.defs +++ b/testing/driver/monkey/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/monkey/Make.defs +# apps/testing/driver/monkey/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_MONKEY),) -CONFIGURED_APPS += $(APPDIR)/testing/monkey +CONFIGURED_APPS += $(APPDIR)/testing/driver/monkey endif diff --git a/testing/monkey/Makefile b/testing/driver/monkey/Makefile similarity index 97% rename from testing/monkey/Makefile rename to testing/driver/monkey/Makefile index 0f572a3545f..fc1d7b9bee1 100644 --- a/testing/monkey/Makefile +++ b/testing/driver/monkey/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/monkey/Makefile +# apps/testing/driver/monkey/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/monkey/monkey.c b/testing/driver/monkey/monkey.c similarity index 99% rename from testing/monkey/monkey.c rename to testing/driver/monkey/monkey.c index 770c59d51e0..6ec003f3ccf 100644 --- a/testing/monkey/monkey.c +++ b/testing/driver/monkey/monkey.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/monkey/monkey.c + * apps/testing/driver/monkey/monkey.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/monkey/monkey.h b/testing/driver/monkey/monkey.h similarity index 98% rename from testing/monkey/monkey.h rename to testing/driver/monkey/monkey.h index b53771a1c2b..57c9c55aa9e 100644 --- a/testing/monkey/monkey.h +++ b/testing/driver/monkey/monkey.h @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/monkey/monkey.h + * apps/testing/driver/monkey/monkey.h * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/monkey/monkey_assert.h b/testing/driver/monkey/monkey_assert.h similarity index 97% rename from testing/monkey/monkey_assert.h rename to testing/driver/monkey/monkey_assert.h index 51d4fd07ced..904b40f7075 100644 --- a/testing/monkey/monkey_assert.h +++ b/testing/driver/monkey/monkey_assert.h @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/monkey/monkey_assert.h + * apps/testing/driver/monkey/monkey_assert.h * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/monkey/monkey_dev.c b/testing/driver/monkey/monkey_dev.c similarity index 99% rename from testing/monkey/monkey_dev.c rename to testing/driver/monkey/monkey_dev.c index 7f196684028..ac6487b0d90 100644 --- a/testing/monkey/monkey_dev.c +++ b/testing/driver/monkey/monkey_dev.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/monkey/monkey_dev.c + * apps/testing/driver/monkey/monkey_dev.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/monkey/monkey_dev.h b/testing/driver/monkey/monkey_dev.h similarity index 98% rename from testing/monkey/monkey_dev.h rename to testing/driver/monkey/monkey_dev.h index b7b61944e4f..1ce5189028d 100644 --- a/testing/monkey/monkey_dev.h +++ b/testing/driver/monkey/monkey_dev.h @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/monkey/monkey_dev.h + * apps/testing/driver/monkey/monkey_dev.h * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/monkey/monkey_event.c b/testing/driver/monkey/monkey_event.c similarity index 99% rename from testing/monkey/monkey_event.c rename to testing/driver/monkey/monkey_event.c index 745d452468a..7836447e5fe 100644 --- a/testing/monkey/monkey_event.c +++ b/testing/driver/monkey/monkey_event.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/monkey/monkey_event.c + * apps/testing/driver/monkey/monkey_event.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/monkey/monkey_event.h b/testing/driver/monkey/monkey_event.h similarity index 98% rename from testing/monkey/monkey_event.h rename to testing/driver/monkey/monkey_event.h index 60ff88ac072..0fbf28da05f 100644 --- a/testing/monkey/monkey_event.h +++ b/testing/driver/monkey/monkey_event.h @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/monkey/monkey_event.h + * apps/testing/driver/monkey/monkey_event.h * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/monkey/monkey_log.c b/testing/driver/monkey/monkey_log.c similarity index 98% rename from testing/monkey/monkey_log.c rename to testing/driver/monkey/monkey_log.c index cd3aaa3d653..b32c5b4733f 100644 --- a/testing/monkey/monkey_log.c +++ b/testing/driver/monkey/monkey_log.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/monkey/monkey_log.c + * apps/testing/driver/monkey/monkey_log.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/monkey/monkey_log.h b/testing/driver/monkey/monkey_log.h similarity index 98% rename from testing/monkey/monkey_log.h rename to testing/driver/monkey/monkey_log.h index 4071e4c95f8..8b11abb770d 100644 --- a/testing/monkey/monkey_log.h +++ b/testing/driver/monkey/monkey_log.h @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/monkey/monkey_log.h + * apps/testing/driver/monkey/monkey_log.h * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/monkey/monkey_main.c b/testing/driver/monkey/monkey_main.c similarity index 99% rename from testing/monkey/monkey_main.c rename to testing/driver/monkey/monkey_main.c index 1ee6945deff..9bd29fa0ae9 100644 --- a/testing/monkey/monkey_main.c +++ b/testing/driver/monkey/monkey_main.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/monkey/monkey_main.c + * apps/testing/driver/monkey/monkey_main.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/monkey/monkey_proc.c b/testing/driver/monkey/monkey_proc.c similarity index 99% rename from testing/monkey/monkey_proc.c rename to testing/driver/monkey/monkey_proc.c index 8040401fee4..d3c5ce5787b 100644 --- a/testing/monkey/monkey_proc.c +++ b/testing/driver/monkey/monkey_proc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/monkey/monkey_proc.c + * apps/testing/driver/monkey/monkey_proc.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/monkey/monkey_recorder.c b/testing/driver/monkey/monkey_recorder.c similarity index 99% rename from testing/monkey/monkey_recorder.c rename to testing/driver/monkey/monkey_recorder.c index cc497e8f8c1..a1949c6b29c 100644 --- a/testing/monkey/monkey_recorder.c +++ b/testing/driver/monkey/monkey_recorder.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/monkey/monkey_recorder.c + * apps/testing/driver/monkey/monkey_recorder.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/monkey/monkey_recorder.h b/testing/driver/monkey/monkey_recorder.h similarity index 98% rename from testing/monkey/monkey_recorder.h rename to testing/driver/monkey/monkey_recorder.h index 756e1a870c0..58ece8ad04a 100644 --- a/testing/monkey/monkey_recorder.h +++ b/testing/driver/monkey/monkey_recorder.h @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/monkey/monkey_recorder.h + * apps/testing/driver/monkey/monkey_recorder.h * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/monkey/monkey_type.h b/testing/driver/monkey/monkey_type.h similarity index 98% rename from testing/monkey/monkey_type.h rename to testing/driver/monkey/monkey_type.h index ed4f8684f99..1ff96a85084 100644 --- a/testing/monkey/monkey_type.h +++ b/testing/driver/monkey/monkey_type.h @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/monkey/monkey_type.h + * apps/testing/driver/monkey/monkey_type.h * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/monkey/monkey_utils.c b/testing/driver/monkey/monkey_utils.c similarity index 99% rename from testing/monkey/monkey_utils.c rename to testing/driver/monkey/monkey_utils.c index 5e54731ac3d..fcf5f5c3f25 100644 --- a/testing/monkey/monkey_utils.c +++ b/testing/driver/monkey/monkey_utils.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/monkey/monkey_utils.c + * apps/testing/driver/monkey/monkey_utils.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/monkey/monkey_utils.h b/testing/driver/monkey/monkey_utils.h similarity index 98% rename from testing/monkey/monkey_utils.h rename to testing/driver/monkey/monkey_utils.h index d559600a366..32825e39ab3 100644 --- a/testing/monkey/monkey_utils.h +++ b/testing/driver/monkey/monkey_utils.h @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/monkey/monkey_utils.h + * apps/testing/driver/monkey/monkey_utils.h * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/nand_sim/CMakeLists.txt b/testing/driver/nand_sim/CMakeLists.txt similarity index 96% rename from testing/nand_sim/CMakeLists.txt rename to testing/driver/nand_sim/CMakeLists.txt index 4f9b4021c60..796a525ad31 100644 --- a/testing/nand_sim/CMakeLists.txt +++ b/testing/driver/nand_sim/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/nand_sim/CMakeLists.txt +# apps/testing/driver/nand_sim/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/nand_sim/Kconfig b/testing/driver/nand_sim/Kconfig similarity index 100% rename from testing/nand_sim/Kconfig rename to testing/driver/nand_sim/Kconfig diff --git a/testing/nand_sim/Make.defs b/testing/driver/nand_sim/Make.defs similarity index 91% rename from testing/nand_sim/Make.defs rename to testing/driver/nand_sim/Make.defs index 05557f6de6c..7cc9c7f6d3e 100644 --- a/testing/nand_sim/Make.defs +++ b/testing/driver/nand_sim/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/nand_sim/Make.defs +# apps/testing/driver/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/driver/nand_sim endif diff --git a/testing/nand_sim/Makefile b/testing/driver/nand_sim/Makefile similarity index 96% rename from testing/nand_sim/Makefile rename to testing/driver/nand_sim/Makefile index a665792095e..43a14a0234e 100644 --- a/testing/nand_sim/Makefile +++ b/testing/driver/nand_sim/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/nand_sim/Makefile +# apps/testing/driver/nand_sim/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/nand_sim/nand_sim_main.c b/testing/driver/nand_sim/nand_sim_main.c similarity index 99% rename from testing/nand_sim/nand_sim_main.c rename to testing/driver/nand_sim/nand_sim_main.c index 63e64b91faf..195709229a3 100644 --- a/testing/nand_sim/nand_sim_main.c +++ b/testing/driver/nand_sim/nand_sim_main.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/nand_sim/nand_sim_main.c + * apps/testing/driver/nand_sim/nand_sim_main.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/pcitest/Kconfig b/testing/driver/pcitest/Kconfig similarity index 100% rename from testing/pcitest/Kconfig rename to testing/driver/pcitest/Kconfig diff --git a/testing/pcitest/Make.defs b/testing/driver/pcitest/Make.defs similarity index 91% rename from testing/pcitest/Make.defs rename to testing/driver/pcitest/Make.defs index 985276be2d4..9cea5a8b20a 100644 --- a/testing/pcitest/Make.defs +++ b/testing/driver/pcitest/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/pcitest/Make.defs +# apps/testing/driver/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/driver/pcitest endif diff --git a/testing/pcitest/Makefile b/testing/driver/pcitest/Makefile similarity index 96% rename from testing/pcitest/Makefile rename to testing/driver/pcitest/Makefile index 46c7050bf56..2a9a5e0f898 100644 --- a/testing/pcitest/Makefile +++ b/testing/driver/pcitest/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/pcitest/Makefile +# apps/testing/driver/pcitest/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/pcitest/pcitest.c b/testing/driver/pcitest/pcitest.c similarity index 99% rename from testing/pcitest/pcitest.c rename to testing/driver/pcitest/pcitest.c index 2814c0c517e..2088d750b1e 100644 --- a/testing/pcitest/pcitest.c +++ b/testing/driver/pcitest/pcitest.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/pcitest/pcitest.c + * apps/testing/driver/pcitest/pcitest.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/sd_bench/Kconfig b/testing/driver/sd_bench/Kconfig similarity index 100% rename from testing/sd_bench/Kconfig rename to testing/driver/sd_bench/Kconfig diff --git a/testing/sd_bench/Make.defs b/testing/driver/sd_bench/Make.defs similarity index 91% rename from testing/sd_bench/Make.defs rename to testing/driver/sd_bench/Make.defs index b9e2b9bb018..a07b3b6389b 100644 --- a/testing/sd_bench/Make.defs +++ b/testing/driver/sd_bench/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/sd_bench/Make.defs +# apps/testing/driver/sd_bench/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_SD_BENCH),) -CONFIGURED_APPS += $(APPDIR)/testing/sd_bench +CONFIGURED_APPS += $(APPDIR)/testing/driver/sd_bench endif diff --git a/testing/sd_bench/Makefile b/testing/driver/sd_bench/Makefile similarity index 96% rename from testing/sd_bench/Makefile rename to testing/driver/sd_bench/Makefile index ddd1789947c..4c04f1d72cc 100644 --- a/testing/sd_bench/Makefile +++ b/testing/driver/sd_bench/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/sd_bench/Makefile +# apps/testing/driver/sd_bench/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/sd_bench/sd_bench_main.c b/testing/driver/sd_bench/sd_bench_main.c similarity index 99% rename from testing/sd_bench/sd_bench_main.c rename to testing/driver/sd_bench/sd_bench_main.c index e2ae7472280..4acead40ae6 100644 --- a/testing/sd_bench/sd_bench_main.c +++ b/testing/driver/sd_bench/sd_bench_main.c @@ -1,8 +1,9 @@ /**************************************************************************** - * apps/testing/sd_bench/sd_bench_main.c + * apps/testing/driver/sd_bench/sd_bench_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 diff --git a/testing/sd_stress/Kconfig b/testing/driver/sd_stress/Kconfig similarity index 100% rename from testing/sd_stress/Kconfig rename to testing/driver/sd_stress/Kconfig diff --git a/testing/sd_stress/Make.defs b/testing/driver/sd_stress/Make.defs similarity index 91% rename from testing/sd_stress/Make.defs rename to testing/driver/sd_stress/Make.defs index 1da23f092af..0ed934adb70 100644 --- a/testing/sd_stress/Make.defs +++ b/testing/driver/sd_stress/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/sd_stress/Make.defs +# apps/testing/driver/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/driver/sd_stress endif diff --git a/testing/sd_stress/Makefile b/testing/driver/sd_stress/Makefile similarity index 96% rename from testing/sd_stress/Makefile rename to testing/driver/sd_stress/Makefile index a70d6857d7b..21cbab4282a 100644 --- a/testing/sd_stress/Makefile +++ b/testing/driver/sd_stress/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/sd_stress/Makefile +# apps/testing/driver/sd_stress/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/sd_stress/sd_stress_main.c b/testing/driver/sd_stress/sd_stress_main.c similarity index 99% rename from testing/sd_stress/sd_stress_main.c rename to testing/driver/sd_stress/sd_stress_main.c index ddb598e804f..de1394e9189 100644 --- a/testing/sd_stress/sd_stress_main.c +++ b/testing/driver/sd_stress/sd_stress_main.c @@ -1,9 +1,9 @@ /**************************************************************************** - * apps/testing/sd_stress/sd_stress_main.c + * apps/testing/driver/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/sensortest/CMakeLists.txt b/testing/driver/sensor/CMakeLists.txt similarity index 96% rename from testing/sensortest/CMakeLists.txt rename to testing/driver/sensor/CMakeLists.txt index a95134c8838..048277d5541 100644 --- a/testing/sensortest/CMakeLists.txt +++ b/testing/driver/sensor/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/sensortest/CMakeLists.txt +# apps/testing/driver/sensor/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/sensortest/Kconfig b/testing/driver/sensor/Kconfig similarity index 100% rename from testing/sensortest/Kconfig rename to testing/driver/sensor/Kconfig diff --git a/testing/sensortest/Make.defs b/testing/driver/sensor/Make.defs similarity index 91% rename from testing/sensortest/Make.defs rename to testing/driver/sensor/Make.defs index 50603af5cb2..b35ddef4cd1 100644 --- a/testing/sensortest/Make.defs +++ b/testing/driver/sensor/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/sensortest/Make.defs +# apps/testing/driver/sensor/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_SENSORTEST),) -CONFIGURED_APPS += $(APPDIR)/testing/sensortest +CONFIGURED_APPS += $(APPDIR)/testing/driver/sensor endif diff --git a/testing/sensortest/Makefile b/testing/driver/sensor/Makefile similarity index 97% rename from testing/sensortest/Makefile rename to testing/driver/sensor/Makefile index 6ecde141018..aff11f344dc 100644 --- a/testing/sensortest/Makefile +++ b/testing/driver/sensor/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/sensortest/Makefile +# apps/testing/driver/sensor/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/sensortest/sensortest.c b/testing/driver/sensor/sensortest.c similarity index 99% rename from testing/sensortest/sensortest.c rename to testing/driver/sensor/sensortest.c index 8576862e2f0..12d513c6195 100644 --- a/testing/sensortest/sensortest.c +++ b/testing/driver/sensor/sensortest.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/sensortest/sensortest.c + * apps/testing/driver/sensor/sensortest.c * * SPDX-License-Identifier: Apache-2.0 * 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 * diff --git a/testing/libc/CMakeLists.txt b/testing/libc/CMakeLists.txt new file mode 100644 index 00000000000..fd0631c9b72 --- /dev/null +++ b/testing/libc/CMakeLists.txt @@ -0,0 +1,24 @@ +# ############################################################################## +# apps/testing/libc/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 "libc") diff --git a/testing/libc/Make.defs b/testing/libc/Make.defs new file mode 100644 index 00000000000..b2f87925816 --- /dev/null +++ b/testing/libc/Make.defs @@ -0,0 +1,23 @@ +############################################################################ +# apps/testing/libc/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/libc/*/Make.defs) diff --git a/testing/libc/Makefile b/testing/libc/Makefile new file mode 100644 index 00000000000..ffea1e8c3c8 --- /dev/null +++ b/testing/libc/Makefile @@ -0,0 +1,25 @@ +############################################################################ +# apps/testing/libc/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 = "libc" + +include $(APPDIR)/Directory.mk diff --git a/testing/arch_libc/CMakeLists.txt b/testing/libc/arch_libc/CMakeLists.txt similarity index 96% rename from testing/arch_libc/CMakeLists.txt rename to testing/libc/arch_libc/CMakeLists.txt index 38224f1752e..89e26e78485 100644 --- a/testing/arch_libc/CMakeLists.txt +++ b/testing/libc/arch_libc/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/arch_libc/CMakeLists.txt +# apps/testing/libc/arch_libc/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/arch_libc/Kconfig b/testing/libc/arch_libc/Kconfig similarity index 100% rename from testing/arch_libc/Kconfig rename to testing/libc/arch_libc/Kconfig diff --git a/testing/arch_libc/Make.defs b/testing/libc/arch_libc/Make.defs similarity index 91% rename from testing/arch_libc/Make.defs rename to testing/libc/arch_libc/Make.defs index 38c935ec2da..5804fc1300b 100644 --- a/testing/arch_libc/Make.defs +++ b/testing/libc/arch_libc/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/arch_libc/Make.defs +# apps/testing/libc/arch_libc/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_ARCH_LIBC),) -CONFIGURED_APPS += $(APPDIR)/testing/arch_libc +CONFIGURED_APPS += $(APPDIR)/testing/libc/arch_libc endif diff --git a/testing/arch_libc/Makefile b/testing/libc/arch_libc/Makefile similarity index 97% rename from testing/arch_libc/Makefile rename to testing/libc/arch_libc/Makefile index ecd4f543474..610e10fa9d6 100644 --- a/testing/arch_libc/Makefile +++ b/testing/libc/arch_libc/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/arch_libc/Makefile +# apps/testing/libc/arch_libc/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/arch_libc/arch_libc_test_main.c b/testing/libc/arch_libc/arch_libc_test_main.c similarity index 99% rename from testing/arch_libc/arch_libc_test_main.c rename to testing/libc/arch_libc/arch_libc_test_main.c index a053b7a1a9f..47cfe65bccd 100644 --- a/testing/arch_libc/arch_libc_test_main.c +++ b/testing/libc/arch_libc/arch_libc_test_main.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/arch_libc/arch_libc_test_main.c + * apps/testing/libc/arch_libc/arch_libc_test_main.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/fmemopen/CMakeLists.txt b/testing/libc/fmemopen/CMakeLists.txt similarity index 96% rename from testing/fmemopen/CMakeLists.txt rename to testing/libc/fmemopen/CMakeLists.txt index 28f688dc123..b36d1c2409d 100644 --- a/testing/fmemopen/CMakeLists.txt +++ b/testing/libc/fmemopen/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/fmemopen/CMakeLists.txt +# apps/testing/libc/fmemopen/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/fmemopen/Kconfig b/testing/libc/fmemopen/Kconfig similarity index 100% rename from testing/fmemopen/Kconfig rename to testing/libc/fmemopen/Kconfig diff --git a/testing/fmemopen/Make.defs b/testing/libc/fmemopen/Make.defs similarity index 91% rename from testing/fmemopen/Make.defs rename to testing/libc/fmemopen/Make.defs index 8082235174a..f96bb49c834 100644 --- a/testing/fmemopen/Make.defs +++ b/testing/libc/fmemopen/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/fmemopen/Make.defs +# apps/testing/libc/fmemopen/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_FMEMOPEN_TEST),) -CONFIGURED_APPS += $(APPDIR)/testing/fmemopen +CONFIGURED_APPS += $(APPDIR)/testing/libc/fmemopen endif diff --git a/testing/fmemopen/Makefile b/testing/libc/fmemopen/Makefile similarity index 96% rename from testing/fmemopen/Makefile rename to testing/libc/fmemopen/Makefile index e62c0c9ad7f..6bcfd61ab1e 100644 --- a/testing/fmemopen/Makefile +++ b/testing/libc/fmemopen/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/fmemopen/Makefile +# apps/testing/libc/fmemopen/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/fmemopen/fmemopen.c b/testing/libc/fmemopen/fmemopen.c similarity index 99% rename from testing/fmemopen/fmemopen.c rename to testing/libc/fmemopen/fmemopen.c index 06b396e038b..101914f1958 100644 --- a/testing/fmemopen/fmemopen.c +++ b/testing/libc/fmemopen/fmemopen.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/fmemopen/fmemopen.c + * apps/testing/libc/fmemopen/fmemopen.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/scanftest/CMakeLists.txt b/testing/libc/scanftest/CMakeLists.txt similarity index 96% rename from testing/scanftest/CMakeLists.txt rename to testing/libc/scanftest/CMakeLists.txt index dc6827bd06b..a85e490115a 100644 --- a/testing/scanftest/CMakeLists.txt +++ b/testing/libc/scanftest/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/scanftest/CMakeLists.txt +# apps/testing/libc/scanftest/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/scanftest/Kconfig b/testing/libc/scanftest/Kconfig similarity index 100% rename from testing/scanftest/Kconfig rename to testing/libc/scanftest/Kconfig diff --git a/testing/scanftest/Make.defs b/testing/libc/scanftest/Make.defs similarity index 91% rename from testing/scanftest/Make.defs rename to testing/libc/scanftest/Make.defs index ebeffd59060..bac5c96f501 100644 --- a/testing/scanftest/Make.defs +++ b/testing/libc/scanftest/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/scanftest/Make.defs +# apps/testing/libc/scanftest/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_SCANFTEST),) -CONFIGURED_APPS += $(APPDIR)/testing/scanftest +CONFIGURED_APPS += $(APPDIR)/testing/libc/scanftest endif diff --git a/testing/scanftest/Makefile b/testing/libc/scanftest/Makefile similarity index 97% rename from testing/scanftest/Makefile rename to testing/libc/scanftest/Makefile index 155b32ae437..6052ffed631 100644 --- a/testing/scanftest/Makefile +++ b/testing/libc/scanftest/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/scanftest/Makefile +# apps/testing/libc/scanftest/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/scanftest/scanftest_main.c b/testing/libc/scanftest/scanftest_main.c similarity index 99% rename from testing/scanftest/scanftest_main.c rename to testing/libc/scanftest/scanftest_main.c index 2ec1f420fdb..6334c3074aa 100644 --- a/testing/scanftest/scanftest_main.c +++ b/testing/libc/scanftest/scanftest_main.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/scanftest/scanftest_main.c + * apps/testing/libc/scanftest/scanftest_main.c * * SPDX-License-Identifier: BSD-3-Clause * SPDX-FileCopyrightText: 2005-01-26, Greg King (https://github.com/cc65) @@ -55,6 +55,7 @@ * * Modified: Johannes Schock */ + /**************************************************************************** * Included Files ****************************************************************************/ diff --git a/testing/mm/CMakeLists.txt b/testing/mm/CMakeLists.txt index 043685f330f..ca97570aeee 100644 --- a/testing/mm/CMakeLists.txt +++ b/testing/mm/CMakeLists.txt @@ -20,18 +20,5 @@ # # ############################################################################## -if(CONFIG_TESTING_MM) - nuttx_add_application( - NAME - ${CONFIG_TESTING_MM_PROGNAME} - PRIORITY - ${CONFIG_TESTING_MM_PRIORITY} - STACKSIZE - ${CONFIG_TESTING_MM_STACKSIZE} - MODULE - ${CONFIG_TESTING_MM} - INCLUDE_DIRECTORIES - ${NUTTX_DIR}/mm/mm_heap - SRCS - mm_main.c) -endif() +nuttx_add_subdirectory() +nuttx_generate_kconfig(MENUDESC "mm") diff --git a/testing/mm/Make.defs b/testing/mm/Make.defs index a82b81f5655..c34a91b81fd 100644 --- a/testing/mm/Make.defs +++ b/testing/mm/Make.defs @@ -20,6 +20,4 @@ # ############################################################################ -ifneq ($(CONFIG_TESTING_MM),) -CONFIGURED_APPS += $(APPDIR)/testing/mm -endif +include $(wildcard $(APPDIR)/testing/mm/*/Make.defs) diff --git a/testing/mm/Makefile b/testing/mm/Makefile index bf202717c68..28307d2e383 100644 --- a/testing/mm/Makefile +++ b/testing/mm/Makefile @@ -20,17 +20,6 @@ # ############################################################################ -include $(APPDIR)/Make.defs +MENUDESC = "mm" -# Memory Management Test - -PROGNAME = $(CONFIG_TESTING_MM_PROGNAME) -PRIORITY = $(CONFIG_TESTING_MM_PRIORITY) -STACKSIZE = $(CONFIG_TESTING_MM_STACKSIZE) -MODULE = $(CONFIG_TESTING_MM) - -MAINSRC = mm_main.c - -CFLAGS += -I$(TOPDIR)/mm/mm_heap - -include $(APPDIR)/Application.mk +include $(APPDIR)/Directory.mk diff --git a/testing/cachetest/CMakeLists.txt b/testing/mm/cachetest/CMakeLists.txt similarity index 96% rename from testing/cachetest/CMakeLists.txt rename to testing/mm/cachetest/CMakeLists.txt index 5eb87601db2..1858d957f2f 100644 --- a/testing/cachetest/CMakeLists.txt +++ b/testing/mm/cachetest/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/cachetest/CMakeLists.txt +# apps/testing/mm/cachetest/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/cachetest/Kconfig b/testing/mm/cachetest/Kconfig similarity index 100% rename from testing/cachetest/Kconfig rename to testing/mm/cachetest/Kconfig diff --git a/testing/cachetest/Make.defs b/testing/mm/cachetest/Make.defs similarity index 92% rename from testing/cachetest/Make.defs rename to testing/mm/cachetest/Make.defs index 70bbd75aa43..ccad027be63 100644 --- a/testing/cachetest/Make.defs +++ b/testing/mm/cachetest/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/cachetest/Make.defs +# apps/testing/mm/cachetest/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_CACHETEST),) -CONFIGURED_APPS += $(APPDIR)/testing/cachetest +CONFIGURED_APPS += $(APPDIR)/testing/mm/cachetest endif diff --git a/testing/cachetest/Makefile b/testing/mm/cachetest/Makefile similarity index 97% rename from testing/cachetest/Makefile rename to testing/mm/cachetest/Makefile index 544e1da4894..45d1378fdd2 100644 --- a/testing/cachetest/Makefile +++ b/testing/mm/cachetest/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/cachetest/Makefile +# apps/testing/mm/cachetest/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/cachetest/cachetest_main.c b/testing/mm/cachetest/cachetest_main.c similarity index 99% rename from testing/cachetest/cachetest_main.c rename to testing/mm/cachetest/cachetest_main.c index ec1653a5904..ff7fe645ddf 100644 --- a/testing/cachetest/cachetest_main.c +++ b/testing/mm/cachetest/cachetest_main.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/cachetest/cachetest_main.c + * apps/testing/mm/cachetest/cachetest_main.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/iob/CMakeLists.txt b/testing/mm/iob/CMakeLists.txt similarity index 97% rename from testing/iob/CMakeLists.txt rename to testing/mm/iob/CMakeLists.txt index e569423b9e3..8698d4163c1 100644 --- a/testing/iob/CMakeLists.txt +++ b/testing/mm/iob/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/iob/CMakeLists.txt +# apps/testing/mm/iob/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/iob/Kconfig b/testing/mm/iob/Kconfig similarity index 100% rename from testing/iob/Kconfig rename to testing/mm/iob/Kconfig diff --git a/testing/iob/Make.defs b/testing/mm/iob/Make.defs similarity index 93% rename from testing/iob/Make.defs rename to testing/mm/iob/Make.defs index 3c51ff18f9a..805cbebecd6 100644 --- a/testing/iob/Make.defs +++ b/testing/mm/iob/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/iob/Make.defs +# apps/testing/mm/iob/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_IOB),) -CONFIGURED_APPS += $(APPDIR)/testing/iob +CONFIGURED_APPS += $(APPDIR)/testing/mm/iob endif diff --git a/testing/iob/Makefile b/testing/mm/iob/Makefile similarity index 97% rename from testing/iob/Makefile rename to testing/mm/iob/Makefile index 3ebb8a27fb9..226bc6ef7b1 100644 --- a/testing/iob/Makefile +++ b/testing/mm/iob/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/iob/Makefile +# apps/testing/mm/iob/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/iob/iob_main.c b/testing/mm/iob/iob_main.c similarity index 99% rename from testing/iob/iob_main.c rename to testing/mm/iob/iob_main.c index 7e6e1991d76..69cfa08cbb8 100644 --- a/testing/iob/iob_main.c +++ b/testing/mm/iob/iob_main.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/iob/iob_main.c + * apps/testing/mm/iob/iob_main.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/kasantest/CMakeLists.txt b/testing/mm/kasantest/CMakeLists.txt similarity index 96% rename from testing/kasantest/CMakeLists.txt rename to testing/mm/kasantest/CMakeLists.txt index ff1c65a4ada..ee58fa8ac4d 100644 --- a/testing/kasantest/CMakeLists.txt +++ b/testing/mm/kasantest/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/kasantest/CMakeLists.txt +# apps/testing/mm/kasantest/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/kasantest/Kconfig b/testing/mm/kasantest/Kconfig similarity index 100% rename from testing/kasantest/Kconfig rename to testing/mm/kasantest/Kconfig diff --git a/testing/kasantest/Make.defs b/testing/mm/kasantest/Make.defs similarity index 92% rename from testing/kasantest/Make.defs rename to testing/mm/kasantest/Make.defs index 6760568e9c3..4cd7a76c7d7 100644 --- a/testing/kasantest/Make.defs +++ b/testing/mm/kasantest/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/kasantest/Make.defs +# apps/testing/mm/kasantest/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_KASAN),) -CONFIGURED_APPS += $(APPDIR)/testing/kasantest +CONFIGURED_APPS += $(APPDIR)/testing/mm/kasantest endif diff --git a/testing/kasantest/Makefile b/testing/mm/kasantest/Makefile similarity index 97% rename from testing/kasantest/Makefile rename to testing/mm/kasantest/Makefile index 5f2669ebe6a..82edc831504 100644 --- a/testing/kasantest/Makefile +++ b/testing/mm/kasantest/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/kasantest/Makefile +# apps/testing/mm/kasantest/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/kasantest/kasantest.c b/testing/mm/kasantest/kasantest.c similarity index 99% rename from testing/kasantest/kasantest.c rename to testing/mm/kasantest/kasantest.c index cdb8b5cecdc..72f1353a10e 100644 --- a/testing/kasantest/kasantest.c +++ b/testing/mm/kasantest/kasantest.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/kasantest/kasantest.c + * apps/testing/mm/kasantest/kasantest.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/memstress/CMakeLists.txt b/testing/mm/memstress/CMakeLists.txt similarity index 96% rename from testing/memstress/CMakeLists.txt rename to testing/mm/memstress/CMakeLists.txt index 5247fbd5739..c3854e15e4a 100644 --- a/testing/memstress/CMakeLists.txt +++ b/testing/mm/memstress/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/memstress/CMakeLists.txt +# apps/testing/mm/memstress/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/memstress/Kconfig b/testing/mm/memstress/Kconfig similarity index 100% rename from testing/memstress/Kconfig rename to testing/mm/memstress/Kconfig diff --git a/testing/memstress/Make.defs b/testing/mm/memstress/Make.defs similarity index 92% rename from testing/memstress/Make.defs rename to testing/mm/memstress/Make.defs index 583cf30668e..b9b8cb9235a 100644 --- a/testing/memstress/Make.defs +++ b/testing/mm/memstress/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/memstress/Make.defs +# apps/testing/mm/memstress/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_MEMORY_STRESS),) -CONFIGURED_APPS += $(APPDIR)/testing/memstress +CONFIGURED_APPS += $(APPDIR)/testing/mm/memstress endif diff --git a/testing/memstress/Makefile b/testing/mm/memstress/Makefile similarity index 97% rename from testing/memstress/Makefile rename to testing/mm/memstress/Makefile index ae4729d146e..380f026501d 100644 --- a/testing/memstress/Makefile +++ b/testing/mm/memstress/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/memstress/Makefile +# apps/testing/mm/memstress/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/memstress/memorystress_main.c b/testing/mm/memstress/memorystress_main.c similarity index 99% rename from testing/memstress/memorystress_main.c rename to testing/mm/memstress/memorystress_main.c index ca43636cb90..6d9b2d98dc6 100644 --- a/testing/memstress/memorystress_main.c +++ b/testing/mm/memstress/memorystress_main.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/memstress/memorystress_main.c + * apps/testing/mm/memstress/memorystress_main.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/memtester/.gitignore b/testing/mm/memtester/.gitignore similarity index 100% rename from testing/memtester/.gitignore rename to testing/mm/memtester/.gitignore diff --git a/testing/memtester/CMakeLists.txt b/testing/mm/memtester/CMakeLists.txt similarity index 98% rename from testing/memtester/CMakeLists.txt rename to testing/mm/memtester/CMakeLists.txt index e7a1d72df41..c60eeb69a8c 100644 --- a/testing/memtester/CMakeLists.txt +++ b/testing/mm/memtester/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/memtester/CMakeLists.txt +# apps/testing/mm/memtester/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/memtester/Kconfig b/testing/mm/memtester/Kconfig similarity index 100% rename from testing/memtester/Kconfig rename to testing/mm/memtester/Kconfig diff --git a/testing/memtester/Make.defs b/testing/mm/memtester/Make.defs similarity index 92% rename from testing/memtester/Make.defs rename to testing/mm/memtester/Make.defs index 315646b8b06..0de51e5da83 100644 --- a/testing/memtester/Make.defs +++ b/testing/mm/memtester/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/memtester/Make.defs +# apps/testing/mm/memtester/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_UTILS_MEMTESTER),) -CONFIGURED_APPS += $(APPDIR)/testing/memtester +CONFIGURED_APPS += $(APPDIR)/testing/mm/memtester endif diff --git a/testing/memtester/Makefile b/testing/mm/memtester/Makefile similarity index 97% rename from testing/memtester/Makefile rename to testing/mm/memtester/Makefile index e577d5829e0..8f7056e97ad 100644 --- a/testing/memtester/Makefile +++ b/testing/mm/memtester/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/memtester/Makefile +# apps/testing/mm/memtester/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/mm/mmtool/CMakeLists.txt b/testing/mm/mmtool/CMakeLists.txt new file mode 100644 index 00000000000..b766e24536d --- /dev/null +++ b/testing/mm/mmtool/CMakeLists.txt @@ -0,0 +1,37 @@ +# ############################################################################## +# apps/testing/mm/mmtool/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. +# +# ############################################################################## + +if(CONFIG_TESTING_MM) + nuttx_add_application( + NAME + ${CONFIG_TESTING_MM_PROGNAME} + PRIORITY + ${CONFIG_TESTING_MM_PRIORITY} + STACKSIZE + ${CONFIG_TESTING_MM_STACKSIZE} + MODULE + ${CONFIG_TESTING_MM} + INCLUDE_DIRECTORIES + ${NUTTX_DIR}/mm/mm_heap + SRCS + mm_main.c) +endif() diff --git a/testing/mm/Kconfig b/testing/mm/mmtool/Kconfig similarity index 99% rename from testing/mm/Kconfig rename to testing/mm/mmtool/Kconfig index a3fc91ded46..8c9e6c0ed6e 100644 --- a/testing/mm/Kconfig +++ b/testing/mm/mmtool/Kconfig @@ -32,3 +32,4 @@ config TESTING_MM_POWEROFF depends on BOARDCTL_POWEROFF endif + diff --git a/testing/mm/mmtool/Make.defs b/testing/mm/mmtool/Make.defs new file mode 100644 index 00000000000..e18350b9e65 --- /dev/null +++ b/testing/mm/mmtool/Make.defs @@ -0,0 +1,25 @@ +############################################################################ +# apps/testing/mm/mmtool/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. +# +############################################################################ + +ifneq ($(CONFIG_TESTING_MM),) +CONFIGURED_APPS += $(APPDIR)/testing/mm/mmtool +endif diff --git a/testing/mm/mmtool/Makefile b/testing/mm/mmtool/Makefile new file mode 100644 index 00000000000..2caf8e258b8 --- /dev/null +++ b/testing/mm/mmtool/Makefile @@ -0,0 +1,36 @@ +############################################################################ +# apps/testing/mm/mmtool/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. +# +############################################################################ + +include $(APPDIR)/Make.defs + +# Memory Management Test + +PROGNAME = $(CONFIG_TESTING_MM_PROGNAME) +PRIORITY = $(CONFIG_TESTING_MM_PRIORITY) +STACKSIZE = $(CONFIG_TESTING_MM_STACKSIZE) +MODULE = $(CONFIG_TESTING_MM) + +MAINSRC = mm_main.c + +CFLAGS += -I$(TOPDIR)/mm/mm_heap + +include $(APPDIR)/Application.mk diff --git a/testing/mm/mm_main.c b/testing/mm/mmtool/mm_main.c similarity index 99% rename from testing/mm/mm_main.c rename to testing/mm/mmtool/mm_main.c index d1d8367ca4d..3578ff36bc8 100644 --- a/testing/mm/mm_main.c +++ b/testing/mm/mmtool/mm_main.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/mm/mm_main.c + * apps/testing/mm/mmtool/mm_main.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/open_memstream/CMakeLists.txt b/testing/mm/open_memstream/CMakeLists.txt similarity index 96% rename from testing/open_memstream/CMakeLists.txt rename to testing/mm/open_memstream/CMakeLists.txt index 67a764030ff..f25b16bd3aa 100644 --- a/testing/open_memstream/CMakeLists.txt +++ b/testing/mm/open_memstream/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/open_memstream/CMakeLists.txt +# apps/testing/mm/open_memstream/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/open_memstream/Kconfig b/testing/mm/open_memstream/Kconfig similarity index 100% rename from testing/open_memstream/Kconfig rename to testing/mm/open_memstream/Kconfig diff --git a/testing/open_memstream/Make.defs b/testing/mm/open_memstream/Make.defs similarity index 91% rename from testing/open_memstream/Make.defs rename to testing/mm/open_memstream/Make.defs index f16c7d494fd..2dccbcd2927 100644 --- a/testing/open_memstream/Make.defs +++ b/testing/mm/open_memstream/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/open_memstream/Make.defs +# apps/testing/mm/open_memstream/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_OPEN_MEMSTREAM),) -CONFIGURED_APPS += $(APPDIR)/testing/open_memstream +CONFIGURED_APPS += $(APPDIR)/testing/mm/open_memstream endif diff --git a/testing/open_memstream/Makefile b/testing/mm/open_memstream/Makefile similarity index 96% rename from testing/open_memstream/Makefile rename to testing/mm/open_memstream/Makefile index 5759cac9f21..58670839e70 100644 --- a/testing/open_memstream/Makefile +++ b/testing/mm/open_memstream/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/open_memstream/Makefile +# apps/testing/mm/open_memstream/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/open_memstream/open_memstream.c b/testing/mm/open_memstream/open_memstream.c similarity index 99% rename from testing/open_memstream/open_memstream.c rename to testing/mm/open_memstream/open_memstream.c index b6f9d59c925..6aec6e83cd4 100644 --- a/testing/open_memstream/open_memstream.c +++ b/testing/mm/open_memstream/open_memstream.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/open_memstream/open_memstream.c + * apps/testing/mm/open_memstream/open_memstream.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/ramtest/CMakeLists.txt b/testing/mm/ramtest/CMakeLists.txt similarity index 96% rename from testing/ramtest/CMakeLists.txt rename to testing/mm/ramtest/CMakeLists.txt index 796f818773f..56de353f4fb 100644 --- a/testing/ramtest/CMakeLists.txt +++ b/testing/mm/ramtest/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/ramtest/CMakeLists.txt +# apps/testing/mm/ramtest/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/ramtest/Kconfig b/testing/mm/ramtest/Kconfig similarity index 100% rename from testing/ramtest/Kconfig rename to testing/mm/ramtest/Kconfig diff --git a/testing/ramtest/Make.defs b/testing/mm/ramtest/Make.defs similarity index 92% rename from testing/ramtest/Make.defs rename to testing/mm/ramtest/Make.defs index b521135d6bb..e42ae25872e 100644 --- a/testing/ramtest/Make.defs +++ b/testing/mm/ramtest/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/ramtest/Make.defs +# apps/testing/mm/ramtest/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_RAMTEST),) -CONFIGURED_APPS += $(APPDIR)/testing/ramtest +CONFIGURED_APPS += $(APPDIR)/testing/mm/ramtest endif diff --git a/testing/ramtest/Makefile b/testing/mm/ramtest/Makefile similarity index 97% rename from testing/ramtest/Makefile rename to testing/mm/ramtest/Makefile index 977f0838acf..44ac4ab6268 100644 --- a/testing/ramtest/Makefile +++ b/testing/mm/ramtest/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/ramtest/Makefile +# apps/testing/mm/ramtest/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/ramtest/ramtest.c b/testing/mm/ramtest/ramtest.c similarity index 99% rename from testing/ramtest/ramtest.c rename to testing/mm/ramtest/ramtest.c index 77989c42145..500e94251d7 100644 --- a/testing/ramtest/ramtest.c +++ b/testing/mm/ramtest/ramtest.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/ramtest/ramtest.c + * apps/testing/mm/ramtest/ramtest.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/resmonitor/CMakeLists.txt b/testing/mm/resmonitor/CMakeLists.txt similarity index 97% rename from testing/resmonitor/CMakeLists.txt rename to testing/mm/resmonitor/CMakeLists.txt index ca110234196..b0c8fa26c4d 100644 --- a/testing/resmonitor/CMakeLists.txt +++ b/testing/mm/resmonitor/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/resmonitor/CMakeLists.txt +# apps/testing/mm/resmonitor/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/resmonitor/Kconfig b/testing/mm/resmonitor/Kconfig similarity index 100% rename from testing/resmonitor/Kconfig rename to testing/mm/resmonitor/Kconfig diff --git a/testing/resmonitor/Make.defs b/testing/mm/resmonitor/Make.defs similarity index 91% rename from testing/resmonitor/Make.defs rename to testing/mm/resmonitor/Make.defs index 886d7b0e9d2..9a1a8ab5aa4 100644 --- a/testing/resmonitor/Make.defs +++ b/testing/mm/resmonitor/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/resmonitor/Make.defs +# apps/testing/mm/resmonitor/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_RESMONITOR),) -CONFIGURED_APPS += $(APPDIR)/testing/resmonitor +CONFIGURED_APPS += $(APPDIR)/testing/mm/resmonitor endif diff --git a/testing/resmonitor/Makefile b/testing/mm/resmonitor/Makefile similarity index 97% rename from testing/resmonitor/Makefile rename to testing/mm/resmonitor/Makefile index b61abd1f34e..ca8d6914bba 100644 --- a/testing/resmonitor/Makefile +++ b/testing/mm/resmonitor/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/resmonitor/Makefile +# apps/testing/mm/resmonitor/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/resmonitor/fillcpu.c b/testing/mm/resmonitor/fillcpu.c similarity index 99% rename from testing/resmonitor/fillcpu.c rename to testing/mm/resmonitor/fillcpu.c index dddf9da5c38..3f6828222e2 100644 --- a/testing/resmonitor/fillcpu.c +++ b/testing/mm/resmonitor/fillcpu.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/resmonitor/fillcpu.c + * apps/testing/mm/resmonitor/fillcpu.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/resmonitor/filldisk.c b/testing/mm/resmonitor/filldisk.c similarity index 99% rename from testing/resmonitor/filldisk.c rename to testing/mm/resmonitor/filldisk.c index 4e7b9e618a7..10474bc1f1b 100644 --- a/testing/resmonitor/filldisk.c +++ b/testing/mm/resmonitor/filldisk.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/resmonitor/filldisk.c + * apps/testing/mm/resmonitor/filldisk.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/resmonitor/fillmem.c b/testing/mm/resmonitor/fillmem.c similarity index 99% rename from testing/resmonitor/fillmem.c rename to testing/mm/resmonitor/fillmem.c index c301d401f01..fddce189de2 100644 --- a/testing/resmonitor/fillmem.c +++ b/testing/mm/resmonitor/fillmem.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/resmonitor/fillmem.c + * apps/testing/mm/resmonitor/fillmem.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/resmonitor/showinfo.c b/testing/mm/resmonitor/showinfo.c similarity index 99% rename from testing/resmonitor/showinfo.c rename to testing/mm/resmonitor/showinfo.c index fe535334beb..e285386aa53 100644 --- a/testing/resmonitor/showinfo.c +++ b/testing/mm/resmonitor/showinfo.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/resmonitor/showinfo.c + * apps/testing/mm/resmonitor/showinfo.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/stressapptest/.gitignore b/testing/mm/stressapptest/.gitignore similarity index 100% rename from testing/stressapptest/.gitignore rename to testing/mm/stressapptest/.gitignore diff --git a/testing/stressapptest/CMakeLists.txt b/testing/mm/stressapptest/CMakeLists.txt similarity index 98% rename from testing/stressapptest/CMakeLists.txt rename to testing/mm/stressapptest/CMakeLists.txt index 4a618c2a012..11fb3788fc6 100644 --- a/testing/stressapptest/CMakeLists.txt +++ b/testing/mm/stressapptest/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/stressapptest/CMakeLists.txt +# apps/testing/mm/stressapptest/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/stressapptest/Kconfig b/testing/mm/stressapptest/Kconfig similarity index 100% rename from testing/stressapptest/Kconfig rename to testing/mm/stressapptest/Kconfig diff --git a/testing/stressapptest/Make.defs b/testing/mm/stressapptest/Make.defs similarity index 91% rename from testing/stressapptest/Make.defs rename to testing/mm/stressapptest/Make.defs index 1b0f51ce594..ce1a15a9b20 100644 --- a/testing/stressapptest/Make.defs +++ b/testing/mm/stressapptest/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/stressapptest/Make.defs +# apps/testing/mm/stressapptest/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_STRESSAPPTEST),) -CONFIGURED_APPS += $(APPDIR)/testing/stressapptest +CONFIGURED_APPS += $(APPDIR)/testing/mm/stressapptest endif diff --git a/testing/stressapptest/Makefile b/testing/mm/stressapptest/Makefile similarity index 98% rename from testing/stressapptest/Makefile rename to testing/mm/stressapptest/Makefile index e124860436d..0e08acba2c0 100644 --- a/testing/stressapptest/Makefile +++ b/testing/mm/stressapptest/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/stressapptest/Makefile +# apps/testing/mm/stressapptest/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/rpmsgdev/CMakeLists.txt b/testing/rpmsg/CMakeLists.txt similarity index 96% rename from testing/rpmsgdev/CMakeLists.txt rename to testing/rpmsg/CMakeLists.txt index 1f6dcb0d1eb..2f98e861b27 100644 --- a/testing/rpmsgdev/CMakeLists.txt +++ b/testing/rpmsg/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/rpmsgdev/CMakeLists.txt +# apps/testing/rpmsg/CMakeLists.txt # # Licensed to the Apache Software Foundation (ASF) under one or more contributor # license agreements. See the NOTICE file distributed with this work for diff --git a/testing/rpmsgdev/Kconfig b/testing/rpmsg/Kconfig similarity index 100% rename from testing/rpmsgdev/Kconfig rename to testing/rpmsg/Kconfig diff --git a/testing/rpmsgdev/Make.defs b/testing/rpmsg/Make.defs similarity index 92% rename from testing/rpmsgdev/Make.defs rename to testing/rpmsg/Make.defs index 686d1e63975..474f832edee 100644 --- a/testing/rpmsgdev/Make.defs +++ b/testing/rpmsg/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/rpmsgdev/Make.defs +# apps/testing/rpmsg/Make.defs # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -19,5 +19,5 @@ ############################################################################ ifneq ($(CONFIG_RPMSGDEV_TEST),) -CONFIGURED_APPS += $(APPDIR)/testing/rpmsgdev +CONFIGURED_APPS += $(APPDIR)/testing/rpmsg endif diff --git a/testing/rpmsgdev/Makefile b/testing/rpmsg/Makefile similarity index 97% rename from testing/rpmsgdev/Makefile rename to testing/rpmsg/Makefile index 771e9ef8545..306f799caa0 100644 --- a/testing/rpmsgdev/Makefile +++ b/testing/rpmsg/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/rpmsgdev/Makefile +# apps/testing/rpmsg/Makefile # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with diff --git a/testing/rpmsgdev/testdev.c b/testing/rpmsg/testdev.c similarity index 99% rename from testing/rpmsgdev/testdev.c rename to testing/rpmsg/testdev.c index f370c4302a3..975ac4cbe64 100644 --- a/testing/rpmsgdev/testdev.c +++ b/testing/rpmsg/testdev.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/rpmsgdev/testdev.c + * apps/testing/rpmsg/testdev.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/testing/sched/CMakeLists.txt b/testing/sched/CMakeLists.txt new file mode 100644 index 00000000000..6a0ff9ebee0 --- /dev/null +++ b/testing/sched/CMakeLists.txt @@ -0,0 +1,24 @@ +# ############################################################################## +# apps/testing/sched/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 "arch") diff --git a/testing/sched/Make.defs b/testing/sched/Make.defs new file mode 100644 index 00000000000..f557eb75d8d --- /dev/null +++ b/testing/sched/Make.defs @@ -0,0 +1,23 @@ +############################################################################ +# apps/testing/sched/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/sched/*/Make.defs) diff --git a/testing/sched/Makefile b/testing/sched/Makefile new file mode 100644 index 00000000000..0e8113b0669 --- /dev/null +++ b/testing/sched/Makefile @@ -0,0 +1,25 @@ +############################################################################ +# apps/testing/sched/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 = "sched" + +include $(APPDIR)/Directory.mk diff --git a/testing/atomic/CMakeLists.txt b/testing/sched/atomic/CMakeLists.txt similarity index 96% rename from testing/atomic/CMakeLists.txt rename to testing/sched/atomic/CMakeLists.txt index 5ae8d006b33..88125d23eae 100644 --- a/testing/atomic/CMakeLists.txt +++ b/testing/sched/atomic/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/atomic/CMakeLists.txt +# apps/testing/sched/atomic/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/atomic/Kconfig b/testing/sched/atomic/Kconfig similarity index 100% rename from testing/atomic/Kconfig rename to testing/sched/atomic/Kconfig diff --git a/testing/atomic/Make.defs b/testing/sched/atomic/Make.defs similarity index 92% rename from testing/atomic/Make.defs rename to testing/sched/atomic/Make.defs index be5f4eb465c..88340408141 100644 --- a/testing/atomic/Make.defs +++ b/testing/sched/atomic/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/atomic/Make.defs +# apps/testing/sched/atomic/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_ATOMIC),) -CONFIGURED_APPS += $(APPDIR)/testing/atomic +CONFIGURED_APPS += $(APPDIR)/testing/sched/atomic endif diff --git a/testing/atomic/Makefile b/testing/sched/atomic/Makefile similarity index 97% rename from testing/atomic/Makefile rename to testing/sched/atomic/Makefile index 19f4d48a3fd..f0b4a9b3170 100644 --- a/testing/atomic/Makefile +++ b/testing/sched/atomic/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/atomic/Makefile +# apps/testing/sched/atomic/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/atomic/atomic_main.c b/testing/sched/atomic/atomic_main.c similarity index 99% rename from testing/atomic/atomic_main.c rename to testing/sched/atomic/atomic_main.c index 7d3985fd99e..17b0f6e81e0 100644 --- a/testing/atomic/atomic_main.c +++ b/testing/sched/atomic/atomic_main.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/atomic/atomic_main.c + * apps/testing/sched/atomic/atomic_main.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/cpuload/CMakeLists.txt b/testing/sched/cpuload/CMakeLists.txt similarity index 96% rename from testing/cpuload/CMakeLists.txt rename to testing/sched/cpuload/CMakeLists.txt index 60d8e2e6444..4472695a3ab 100644 --- a/testing/cpuload/CMakeLists.txt +++ b/testing/sched/cpuload/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/cpuload/CMakeLists.txt +# apps/testing/sched/cpuload/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/cpuload/Kconfig b/testing/sched/cpuload/Kconfig similarity index 100% rename from testing/cpuload/Kconfig rename to testing/sched/cpuload/Kconfig diff --git a/testing/cpuload/Make.defs b/testing/sched/cpuload/Make.defs similarity index 91% rename from testing/cpuload/Make.defs rename to testing/sched/cpuload/Make.defs index c43feb47912..f1901439cf6 100644 --- a/testing/cpuload/Make.defs +++ b/testing/sched/cpuload/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/cpuload/Make.defs +# apps/testing/sched/cpuload/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_CPULOAD),) -CONFIGURED_APPS += $(APPDIR)/testing/cpuload +CONFIGURED_APPS += $(APPDIR)/testing/sched/cpuload endif diff --git a/testing/cpuload/Makefile b/testing/sched/cpuload/Makefile similarity index 96% rename from testing/cpuload/Makefile rename to testing/sched/cpuload/Makefile index 45fcb82c266..758daa9e942 100644 --- a/testing/cpuload/Makefile +++ b/testing/sched/cpuload/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/cpuload/Makefile +# apps/testing/sched/cpuload/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/cpuload/cpuload_main.c b/testing/sched/cpuload/cpuload_main.c similarity index 98% rename from testing/cpuload/cpuload_main.c rename to testing/sched/cpuload/cpuload_main.c index daa56dd8567..eadd6dd05b8 100644 --- a/testing/cpuload/cpuload_main.c +++ b/testing/sched/cpuload/cpuload_main.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/cpuload/cpuload_main.c + * apps/testing/sched/cpuload/cpuload_main.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/getprime/CMakeLists.txt b/testing/sched/getprime/CMakeLists.txt similarity index 96% rename from testing/getprime/CMakeLists.txt rename to testing/sched/getprime/CMakeLists.txt index 407ae9649f8..7cafff8250f 100644 --- a/testing/getprime/CMakeLists.txt +++ b/testing/sched/getprime/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/getprime/CMakeLists.txt +# apps/testing/sched/getprime/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/getprime/Kconfig b/testing/sched/getprime/Kconfig similarity index 100% rename from testing/getprime/Kconfig rename to testing/sched/getprime/Kconfig diff --git a/testing/getprime/Make.defs b/testing/sched/getprime/Make.defs similarity index 91% rename from testing/getprime/Make.defs rename to testing/sched/getprime/Make.defs index d990dc0ba81..7591f4bb17a 100644 --- a/testing/getprime/Make.defs +++ b/testing/sched/getprime/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/getprime/Make.defs +# apps/testing/sched/getprime/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_GETPRIME),) -CONFIGURED_APPS += $(APPDIR)/testing/getprime +CONFIGURED_APPS += $(APPDIR)/testing/sched/getprime endif diff --git a/testing/getprime/Makefile b/testing/sched/getprime/Makefile similarity index 97% rename from testing/getprime/Makefile rename to testing/sched/getprime/Makefile index b7605743c21..3a728b04d77 100644 --- a/testing/getprime/Makefile +++ b/testing/sched/getprime/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/getprime/Makefile +# apps/testing/sched/getprime/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/getprime/getprime_main.c b/testing/sched/getprime/getprime_main.c similarity index 99% rename from testing/getprime/getprime_main.c rename to testing/sched/getprime/getprime_main.c index 710f07dac28..bee2509be4b 100644 --- a/testing/getprime/getprime_main.c +++ b/testing/sched/getprime/getprime_main.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/getprime/getprime_main.c + * apps/testing/sched/getprime/getprime_main.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/smp/CMakeLists.txt b/testing/sched/smp/CMakeLists.txt similarity index 96% rename from testing/smp/CMakeLists.txt rename to testing/sched/smp/CMakeLists.txt index ada0bceb154..0848fc605dc 100644 --- a/testing/smp/CMakeLists.txt +++ b/testing/sched/smp/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/smp/CMakeLists.txt +# apps/testing/sched/smp/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/smp/Kconfig b/testing/sched/smp/Kconfig similarity index 100% rename from testing/smp/Kconfig rename to testing/sched/smp/Kconfig diff --git a/testing/smp/Make.defs b/testing/sched/smp/Make.defs similarity index 92% rename from testing/smp/Make.defs rename to testing/sched/smp/Make.defs index 78a315d54c8..2f6d49e7af1 100644 --- a/testing/smp/Make.defs +++ b/testing/sched/smp/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/smp/Make.defs +# apps/testing/sched/smp/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_SMP),) -CONFIGURED_APPS += $(APPDIR)/testing/smp +CONFIGURED_APPS += $(APPDIR)/testing/sched/smp endif diff --git a/testing/smp/Makefile b/testing/sched/smp/Makefile similarity index 97% rename from testing/smp/Makefile rename to testing/sched/smp/Makefile index dd36b1c38bd..e9287d0dd61 100644 --- a/testing/smp/Makefile +++ b/testing/sched/smp/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/smp/Makefile +# apps/testing/sched/smp/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/smp/smp_main.c b/testing/sched/smp/smp_main.c similarity index 99% rename from testing/smp/smp_main.c rename to testing/sched/smp/smp_main.c index c5fedcb740d..8c3b94e7e6c 100644 --- a/testing/smp/smp_main.c +++ b/testing/sched/smp/smp_main.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/smp/smp_main.c + * apps/testing/sched/smp/smp_main.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/timerjitter/CMakeLists.txt b/testing/sched/timerjitter/CMakeLists.txt similarity index 96% rename from testing/timerjitter/CMakeLists.txt rename to testing/sched/timerjitter/CMakeLists.txt index 41a369aa2f0..dc84086eb4e 100644 --- a/testing/timerjitter/CMakeLists.txt +++ b/testing/sched/timerjitter/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/timerjitter/CMakeLists.txt +# apps/testing/sched/timerjitter/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/timerjitter/Kconfig b/testing/sched/timerjitter/Kconfig similarity index 100% rename from testing/timerjitter/Kconfig rename to testing/sched/timerjitter/Kconfig diff --git a/testing/timerjitter/Make.defs b/testing/sched/timerjitter/Make.defs similarity index 91% rename from testing/timerjitter/Make.defs rename to testing/sched/timerjitter/Make.defs index f5ee5351890..a27647e4d28 100644 --- a/testing/timerjitter/Make.defs +++ b/testing/sched/timerjitter/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/timerjitter/Make.defs +# apps/testing/sched/timerjitter/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_TIMERJITTER),) -CONFIGURED_APPS += $(APPDIR)/testing/timerjitter +CONFIGURED_APPS += $(APPDIR)/testing/sched/timerjitter endif diff --git a/testing/timerjitter/Makefile b/testing/sched/timerjitter/Makefile similarity index 96% rename from testing/timerjitter/Makefile rename to testing/sched/timerjitter/Makefile index 993f06fff7f..65052cabb0a 100644 --- a/testing/timerjitter/Makefile +++ b/testing/sched/timerjitter/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/timerjitter/Makefile +# apps/testing/sched/timerjitter/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/timerjitter/timerjitter.c b/testing/sched/timerjitter/timerjitter.c similarity index 99% rename from testing/timerjitter/timerjitter.c rename to testing/sched/timerjitter/timerjitter.c index 3e335339127..ad956cd4ca9 100644 --- a/testing/timerjitter/timerjitter.c +++ b/testing/sched/timerjitter/timerjitter.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/timerjitter/timerjitter.c + * apps/testing/sched/timerjitter/timerjitter.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/security/CMakeLists.txt b/testing/security/CMakeLists.txt new file mode 100644 index 00000000000..8da5809adf5 --- /dev/null +++ b/testing/security/CMakeLists.txt @@ -0,0 +1,24 @@ +# ############################################################################## +# apps/testing/security/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 "security") diff --git a/testing/security/Make.defs b/testing/security/Make.defs new file mode 100644 index 00000000000..c595b43781e --- /dev/null +++ b/testing/security/Make.defs @@ -0,0 +1,23 @@ +############################################################################ +# apps/testing/security/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/security/*/Make.defs) diff --git a/testing/security/Makefile b/testing/security/Makefile new file mode 100644 index 00000000000..3d280f93d89 --- /dev/null +++ b/testing/security/Makefile @@ -0,0 +1,25 @@ +############################################################################ +# apps/testing/security/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 = "security" + +include $(APPDIR)/Directory.mk diff --git a/testing/crypto/3descbc.c b/testing/security/crypto/3descbc.c similarity index 99% rename from testing/crypto/3descbc.c rename to testing/security/crypto/3descbc.c index 7bf1c836fc6..453f06f3e14 100644 --- a/testing/crypto/3descbc.c +++ b/testing/security/crypto/3descbc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/crypto/3descbc.c + * apps/testing/security/crypto/3descbc.c * * SPDX-License-Identifier: BSD-2-Clause * SPDX-FileCopyrightText: 2002 Markus Friedl. All rights reserved. diff --git a/testing/crypto/CMakeLists.txt b/testing/security/crypto/CMakeLists.txt similarity index 98% rename from testing/crypto/CMakeLists.txt rename to testing/security/crypto/CMakeLists.txt index 76df6e7a63d..57694c6818f 100644 --- a/testing/crypto/CMakeLists.txt +++ b/testing/security/crypto/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/crypto/CMakeLists.txt +# apps/testing/security/crypto/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/crypto/Kconfig b/testing/security/crypto/Kconfig similarity index 100% rename from testing/crypto/Kconfig rename to testing/security/crypto/Kconfig diff --git a/testing/crypto/Make.defs b/testing/security/crypto/Make.defs similarity index 91% rename from testing/crypto/Make.defs rename to testing/security/crypto/Make.defs index 5d0dee36116..66be5021299 100644 --- a/testing/crypto/Make.defs +++ b/testing/security/crypto/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/crypto/Make.defs +# apps/testing/security/crypto/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_CRYPTO),) -CONFIGURED_APPS += $(APPDIR)/testing/crypto +CONFIGURED_APPS += $(APPDIR)/testing/security/crypto endif diff --git a/testing/crypto/Makefile b/testing/security/crypto/Makefile similarity index 98% rename from testing/crypto/Makefile rename to testing/security/crypto/Makefile index 825eac40782..743715f6112 100644 --- a/testing/crypto/Makefile +++ b/testing/security/crypto/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/crypto/Makefile +# apps/testing/security/crypto/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/crypto/aescbc.c b/testing/security/crypto/aescbc.c similarity index 99% rename from testing/crypto/aescbc.c rename to testing/security/crypto/aescbc.c index 0c9f464ebdb..48bcfbccc11 100644 --- a/testing/crypto/aescbc.c +++ b/testing/security/crypto/aescbc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/crypto/aescbc.c + * apps/testing/security/crypto/aescbc.c * * SPDX-License-Identifier: ISC * SPDX-FileCopyrightText: 2005 Markus Friedl. All rights reserved. diff --git a/testing/crypto/aescmac.c b/testing/security/crypto/aescmac.c similarity index 99% rename from testing/crypto/aescmac.c rename to testing/security/crypto/aescmac.c index 0e0f57838ba..93d8deb7007 100644 --- a/testing/crypto/aescmac.c +++ b/testing/security/crypto/aescmac.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/crypto/aescmac.c + * apps/testing/security/crypto/aescmac.c * * SPDX-License-Identifier: ISC * diff --git a/testing/crypto/aesctr.c b/testing/security/crypto/aesctr.c similarity index 99% rename from testing/crypto/aesctr.c rename to testing/security/crypto/aesctr.c index bf1d9914488..29507b5d759 100644 --- a/testing/crypto/aesctr.c +++ b/testing/security/crypto/aesctr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/crypto/aesctr.c + * apps/testing/security/crypto/aesctr.c * * SPDX-License-Identifier: ISC * SPDX-FileCopyrightText: 2005 Markus Friedl diff --git a/testing/crypto/aesxts.c b/testing/security/crypto/aesxts.c similarity index 99% rename from testing/crypto/aesxts.c rename to testing/security/crypto/aesxts.c index 1692af6bf32..13a3030bf04 100644 --- a/testing/crypto/aesxts.c +++ b/testing/security/crypto/aesxts.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/crypto/aesxts.c + * apps/testing/security/crypto/aesxts.c * * SPDX-License-Identifier: BSD-2-Clause * SPDX-FileCopyrightText: 2002 Markus Friedl. All rights reserved. diff --git a/testing/crypto/crc32.c b/testing/security/crypto/crc32.c similarity index 99% rename from testing/crypto/crc32.c rename to testing/security/crypto/crc32.c index 9fa227c5d3d..bfea364fc52 100644 --- a/testing/crypto/crc32.c +++ b/testing/security/crypto/crc32.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/crypto/crc32.c + * apps/testing/security/crypto/crc32.c * * SPDX-License-Identifier: ISC * diff --git a/testing/crypto/dhm.c b/testing/security/crypto/dhm.c similarity index 99% rename from testing/crypto/dhm.c rename to testing/security/crypto/dhm.c index 038376104d3..883a506b652 100644 --- a/testing/crypto/dhm.c +++ b/testing/security/crypto/dhm.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/crypto/dhm.c + * apps/testing/security/crypto/dhm.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/crypto/ecdsa.c b/testing/security/crypto/ecdsa.c similarity index 99% rename from testing/crypto/ecdsa.c rename to testing/security/crypto/ecdsa.c index 007b93b778f..9551c01d17d 100644 --- a/testing/crypto/ecdsa.c +++ b/testing/security/crypto/ecdsa.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/crypto/ecdsa.c + * apps/testing/security/crypto/ecdsa.c * * SPDX-License-Identifier: ISC * diff --git a/testing/crypto/hash.c b/testing/security/crypto/hash.c similarity index 99% rename from testing/crypto/hash.c rename to testing/security/crypto/hash.c index 1c3d6e6eecd..0b2f53dc7c2 100644 --- a/testing/crypto/hash.c +++ b/testing/security/crypto/hash.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/crypto/hash.c + * apps/testing/security/crypto/hash.c * * SPDX-License-Identifier: ISC * diff --git a/testing/crypto/hmac.c b/testing/security/crypto/hmac.c similarity index 99% rename from testing/crypto/hmac.c rename to testing/security/crypto/hmac.c index 48ea6ae460f..10bb5e671e2 100644 --- a/testing/crypto/hmac.c +++ b/testing/security/crypto/hmac.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/crypto/hmac.c + * apps/testing/security/crypto/hmac.c * * SPDX-License-Identifier: ISC * SPDX-FileCopyrightText: 2008 Damien Bergamini diff --git a/testing/crypto/rsa.c b/testing/security/crypto/rsa.c similarity index 99% rename from testing/crypto/rsa.c rename to testing/security/crypto/rsa.c index e4fe7778a10..97fd2da43c1 100644 --- a/testing/crypto/rsa.c +++ b/testing/security/crypto/rsa.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/crypto/rsa.c + * apps/testing/security/crypto/rsa.c * * SPDX-License-Identifier: ISC * diff --git a/testing/nist-sts/.gitignore b/testing/security/nist-sts/.gitignore similarity index 100% rename from testing/nist-sts/.gitignore rename to testing/security/nist-sts/.gitignore diff --git a/testing/nist-sts/0001-Solve-the-memory-out-of-bounds-problem-in-sts.patch b/testing/security/nist-sts/0001-Solve-the-memory-out-of-bounds-problem-in-sts.patch similarity index 100% rename from testing/nist-sts/0001-Solve-the-memory-out-of-bounds-problem-in-sts.patch rename to testing/security/nist-sts/0001-Solve-the-memory-out-of-bounds-problem-in-sts.patch diff --git a/testing/nist-sts/0002-Fix-bug-that-crash-in-running-a-single-test-after-ru.patch b/testing/security/nist-sts/0002-Fix-bug-that-crash-in-running-a-single-test-after-ru.patch similarity index 100% rename from testing/nist-sts/0002-Fix-bug-that-crash-in-running-a-single-test-after-ru.patch rename to testing/security/nist-sts/0002-Fix-bug-that-crash-in-running-a-single-test-after-ru.patch diff --git a/testing/nist-sts/CMakeLists.txt b/testing/security/nist-sts/CMakeLists.txt similarity index 95% rename from testing/nist-sts/CMakeLists.txt rename to testing/security/nist-sts/CMakeLists.txt index e61b2b19118..d10adb5c5bc 100644 --- a/testing/nist-sts/CMakeLists.txt +++ b/testing/security/nist-sts/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/nist-sts/CMakeLists.txt +# apps/testing/security/nist-sts/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # @@ -32,7 +32,7 @@ if(CONFIG_TESTING_NIST_STS) FetchContent_Declare( nist-sts_fetch URL ${CONFIG_NIST_URL} SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/nist-sts - BINARY_DIR ${CMAKE_BINARY_DIR}/apps/testing/nist-sts/nist-sts + BINARY_DIR ${CMAKE_BINARY_DIR}/apps/testing/security/nist-sts/nist-sts PATCH_COMMAND patch -p0 -d ${CMAKE_CURRENT_LIST_DIR}/nist-sts < ${CMAKE_CURRENT_LIST_DIR}/0001-Solve-the-memory-out-of-bounds-problem-in-sts.patch diff --git a/testing/nist-sts/Kconfig b/testing/security/nist-sts/Kconfig similarity index 100% rename from testing/nist-sts/Kconfig rename to testing/security/nist-sts/Kconfig diff --git a/testing/nist-sts/Make.defs b/testing/security/nist-sts/Make.defs similarity index 91% rename from testing/nist-sts/Make.defs rename to testing/security/nist-sts/Make.defs index 3bb4a2e35b3..282ad04b9ab 100644 --- a/testing/nist-sts/Make.defs +++ b/testing/security/nist-sts/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/nist-sts/Make.defs +# apps/testing/security/nist-sts/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_NIST_STS),) -CONFIGURED_APPS += $(APPDIR)/testing/nist-sts +CONFIGURED_APPS += $(APPDIR)/testing/security/nist-sts endif diff --git a/testing/nist-sts/Makefile b/testing/security/nist-sts/Makefile similarity index 98% rename from testing/nist-sts/Makefile rename to testing/security/nist-sts/Makefile index 4240db96883..76cc96d8be5 100644 --- a/testing/nist-sts/Makefile +++ b/testing/security/nist-sts/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/nist-sts/Makefile +# apps/testing/security/nist-sts/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/setest/CMakeLists.txt b/testing/security/setest/CMakeLists.txt similarity index 96% rename from testing/setest/CMakeLists.txt rename to testing/security/setest/CMakeLists.txt index 27235b4351a..fe68f6c98e1 100644 --- a/testing/setest/CMakeLists.txt +++ b/testing/security/setest/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/setest/CMakeLists.txt +# apps/testing/security/setest/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/setest/Kconfig b/testing/security/setest/Kconfig similarity index 100% rename from testing/setest/Kconfig rename to testing/security/setest/Kconfig diff --git a/testing/setest/Make.defs b/testing/security/setest/Make.defs similarity index 91% rename from testing/setest/Make.defs rename to testing/security/setest/Make.defs index 701bb5f0aac..fec696fc5db 100644 --- a/testing/setest/Make.defs +++ b/testing/security/setest/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/setest/Make.defs +# apps/testing/security/setest/Make.defs # # SPDX-License-Identifier: Apache-2.0 # @@ -21,5 +21,5 @@ ############################################################################ ifneq ($(CONFIG_TESTING_SETEST),) -CONFIGURED_APPS += $(APPDIR)/testing/setest +CONFIGURED_APPS += $(APPDIR)/testing/security/setest endif diff --git a/testing/setest/Makefile b/testing/security/setest/Makefile similarity index 96% rename from testing/setest/Makefile rename to testing/security/setest/Makefile index 594455749f4..bffaeb217a8 100644 --- a/testing/setest/Makefile +++ b/testing/security/setest/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/setest/Makefile +# apps/testing/security/setest/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/setest/setest.c b/testing/security/setest/setest.c similarity index 99% rename from testing/setest/setest.c rename to testing/security/setest/setest.c index f16fca4a18d..db53a6cd3ba 100644 --- a/testing/setest/setest.c +++ b/testing/security/setest/setest.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/setest/setest.c + * apps/testing/security/setest/setest.c * * SPDX-License-Identifier: Apache-2.0 *