From 0ee9fac4e4deb3f21e7be45926c163c3d7e15038 Mon Sep 17 00:00:00 2001 From: tengshuangshuang Date: Wed, 22 Jan 2025 09:19:43 +0800 Subject: [PATCH] apps/testing:move arch_libc, fmemopen, scanftest folders to the new lib folder Signed-off-by: tengshuangshuang --- testing/libc/.gitignore | 1 + testing/libc/CMakeLists.txt | 24 ++++++++++++++++++ testing/libc/Make.defs | 23 +++++++++++++++++ testing/libc/Makefile | 25 +++++++++++++++++++ testing/{ => libc}/arch_libc/CMakeLists.txt | 2 +- testing/{ => libc}/arch_libc/Kconfig | 0 testing/{ => libc}/arch_libc/Make.defs | 4 +-- testing/{ => libc}/arch_libc/Makefile | 2 +- .../arch_libc/arch_libc_test_main.c | 2 +- testing/{ => libc}/fmemopen/CMakeLists.txt | 2 +- testing/{ => libc}/fmemopen/Kconfig | 0 testing/{ => libc}/fmemopen/Make.defs | 4 +-- testing/{ => libc}/fmemopen/Makefile | 2 +- testing/{ => libc}/fmemopen/fmemopen.c | 2 +- testing/{ => libc}/scanftest/CMakeLists.txt | 2 +- testing/{ => libc}/scanftest/Kconfig | 0 testing/{ => libc}/scanftest/Make.defs | 4 +-- testing/{ => libc}/scanftest/Makefile | 2 +- testing/{ => libc}/scanftest/scanftest_main.c | 3 ++- 19 files changed, 89 insertions(+), 15 deletions(-) create mode 100644 testing/libc/.gitignore create mode 100644 testing/libc/CMakeLists.txt create mode 100644 testing/libc/Make.defs create mode 100644 testing/libc/Makefile rename testing/{ => libc}/arch_libc/CMakeLists.txt (96%) rename testing/{ => libc}/arch_libc/Kconfig (100%) rename testing/{ => libc}/arch_libc/Make.defs (91%) rename testing/{ => libc}/arch_libc/Makefile (97%) rename testing/{ => libc}/arch_libc/arch_libc_test_main.c (99%) rename testing/{ => libc}/fmemopen/CMakeLists.txt (96%) rename testing/{ => libc}/fmemopen/Kconfig (100%) rename testing/{ => libc}/fmemopen/Make.defs (91%) rename testing/{ => libc}/fmemopen/Makefile (96%) rename testing/{ => libc}/fmemopen/fmemopen.c (99%) rename testing/{ => libc}/scanftest/CMakeLists.txt (96%) rename testing/{ => libc}/scanftest/Kconfig (100%) rename testing/{ => libc}/scanftest/Make.defs (91%) rename testing/{ => libc}/scanftest/Makefile (97%) rename testing/{ => libc}/scanftest/scanftest_main.c (99%) diff --git a/testing/libc/.gitignore b/testing/libc/.gitignore new file mode 100644 index 00000000000..9e1d2593ee8 --- /dev/null +++ b/testing/libc/.gitignore @@ -0,0 +1 @@ +/Kconfig 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 ****************************************************************************/