From 57c56e549085377f88763452b0a537cc95b071ba Mon Sep 17 00:00:00 2001 From: tengshuangshuang Date: Mon, 20 Jan 2025 11:07:25 +0800 Subject: [PATCH] apps/testing: move himem_test,mtetest and x86-64-ABI folders to the new arhc folder Signed-off-by: tengshuangshuang --- testing/arch/.gitignore | 1 + testing/arch/CMakeLists.txt | 24 ++++++++++++++++++ testing/arch/Make.defs | 23 +++++++++++++++++ testing/arch/Makefile | 25 +++++++++++++++++++ testing/{ => arch}/himem_test/Kconfig | 0 testing/{ => arch}/himem_test/LibIncludes.mk | 2 +- testing/{ => arch}/himem_test/Make.defs | 4 +-- testing/{ => arch}/himem_test/Makefile | 4 +-- .../himem_test/himem_chardev_test.c | 2 +- testing/{ => arch}/mtetest/CMakeLists.txt | 2 +- testing/{ => arch}/mtetest/Kconfig | 0 testing/{ => arch}/mtetest/Make.defs | 4 +-- testing/{ => arch}/mtetest/Makefile | 2 +- testing/{ => arch}/mtetest/mtetest.c | 2 +- testing/{ => arch}/x86-64-ABI/.gitignore | 0 ...lve-the-issue-of-compilation-failure.patch | 0 testing/{ => arch}/x86-64-ABI/Kconfig | 0 testing/{ => arch}/x86-64-ABI/Make.defs | 4 +-- testing/{ => arch}/x86-64-ABI/Makefile | 2 +- 19 files changed, 87 insertions(+), 14 deletions(-) create mode 100644 testing/arch/.gitignore create mode 100644 testing/arch/CMakeLists.txt create mode 100644 testing/arch/Make.defs create mode 100644 testing/arch/Makefile rename testing/{ => arch}/himem_test/Kconfig (100%) rename testing/{ => arch}/himem_test/LibIncludes.mk (96%) rename testing/{ => arch}/himem_test/Make.defs (91%) rename testing/{ => arch}/himem_test/Makefile (93%) rename testing/{ => arch}/himem_test/himem_chardev_test.c (99%) rename testing/{ => arch}/mtetest/CMakeLists.txt (96%) rename testing/{ => arch}/mtetest/Kconfig (100%) rename testing/{ => arch}/mtetest/Make.defs (92%) rename testing/{ => arch}/mtetest/Makefile (96%) rename testing/{ => arch}/mtetest/mtetest.c (99%) rename testing/{ => arch}/x86-64-ABI/.gitignore (100%) rename testing/{ => arch}/x86-64-ABI/0001-app-testing-Resolve-the-issue-of-compilation-failure.patch (100%) rename testing/{ => arch}/x86-64-ABI/Kconfig (100%) rename testing/{ => arch}/x86-64-ABI/Make.defs (91%) rename testing/{ => arch}/x86-64-ABI/Makefile (98%) diff --git a/testing/arch/.gitignore b/testing/arch/.gitignore new file mode 100644 index 00000000000..9e1d2593ee8 --- /dev/null +++ b/testing/arch/.gitignore @@ -0,0 +1 @@ +/Kconfig 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 #