From b7f05e89ba81b5b6185bfb09e2713b18be0cf339 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Sat, 25 Jan 2025 20:46:26 +0800 Subject: [PATCH] testing: Move crypto/setest to drivers and open_memstream to libc follow the dissusion from: https://github.com/apache/nuttx-apps/pull/2931 Signed-off-by: Xiang Xiao --- testing/{ => drivers}/crypto/3descbc.c | 2 +- testing/{ => drivers}/crypto/CMakeLists.txt | 2 +- testing/{ => drivers}/crypto/Kconfig | 0 testing/{ => drivers}/crypto/Make.defs | 4 ++-- testing/{ => drivers}/crypto/Makefile | 2 +- testing/{ => drivers}/crypto/aescbc.c | 2 +- testing/{ => drivers}/crypto/aescmac.c | 2 +- testing/{ => drivers}/crypto/aesctr.c | 2 +- testing/{ => drivers}/crypto/aesxts.c | 2 +- testing/{ => drivers}/crypto/crc32.c | 2 +- testing/{ => drivers}/crypto/dhm.c | 2 +- testing/{ => drivers}/crypto/ecdsa.c | 2 +- testing/{ => drivers}/crypto/hash.c | 2 +- testing/{ => drivers}/crypto/hmac.c | 2 +- testing/{ => drivers}/crypto/rsa.c | 2 +- testing/{ => drivers}/setest/CMakeLists.txt | 2 +- testing/{ => drivers}/setest/Kconfig | 0 testing/{ => drivers}/setest/Make.defs | 4 ++-- testing/{ => drivers}/setest/Makefile | 2 +- testing/{ => drivers}/setest/setest.c | 2 +- testing/{ => libc}/open_memstream/CMakeLists.txt | 2 +- testing/{ => libc}/open_memstream/Kconfig | 0 testing/{ => libc}/open_memstream/Make.defs | 4 ++-- testing/{ => libc}/open_memstream/Makefile | 2 +- testing/{ => libc}/open_memstream/open_memstream.c | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) rename testing/{ => drivers}/crypto/3descbc.c (99%) rename testing/{ => drivers}/crypto/CMakeLists.txt (98%) rename testing/{ => drivers}/crypto/Kconfig (100%) rename testing/{ => drivers}/crypto/Make.defs (91%) rename testing/{ => drivers}/crypto/Makefile (98%) rename testing/{ => drivers}/crypto/aescbc.c (99%) rename testing/{ => drivers}/crypto/aescmac.c (99%) rename testing/{ => drivers}/crypto/aesctr.c (99%) rename testing/{ => drivers}/crypto/aesxts.c (99%) rename testing/{ => drivers}/crypto/crc32.c (99%) rename testing/{ => drivers}/crypto/dhm.c (99%) rename testing/{ => drivers}/crypto/ecdsa.c (99%) rename testing/{ => drivers}/crypto/hash.c (99%) rename testing/{ => drivers}/crypto/hmac.c (99%) rename testing/{ => drivers}/crypto/rsa.c (99%) rename testing/{ => drivers}/setest/CMakeLists.txt (96%) rename testing/{ => drivers}/setest/Kconfig (100%) rename testing/{ => drivers}/setest/Make.defs (91%) rename testing/{ => drivers}/setest/Makefile (96%) rename testing/{ => drivers}/setest/setest.c (99%) rename testing/{ => libc}/open_memstream/CMakeLists.txt (95%) rename testing/{ => libc}/open_memstream/Kconfig (100%) rename testing/{ => libc}/open_memstream/Make.defs (90%) rename testing/{ => libc}/open_memstream/Makefile (96%) rename testing/{ => libc}/open_memstream/open_memstream.c (99%) diff --git a/testing/crypto/3descbc.c b/testing/drivers/crypto/3descbc.c similarity index 99% rename from testing/crypto/3descbc.c rename to testing/drivers/crypto/3descbc.c index 7bf1c836f..7966e34bb 100644 --- a/testing/crypto/3descbc.c +++ b/testing/drivers/crypto/3descbc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/crypto/3descbc.c + * apps/testing/drivers/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/drivers/crypto/CMakeLists.txt similarity index 98% rename from testing/crypto/CMakeLists.txt rename to testing/drivers/crypto/CMakeLists.txt index 76df6e7a6..3918043a1 100644 --- a/testing/crypto/CMakeLists.txt +++ b/testing/drivers/crypto/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/crypto/CMakeLists.txt +# apps/testing/drivers/crypto/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/crypto/Kconfig b/testing/drivers/crypto/Kconfig similarity index 100% rename from testing/crypto/Kconfig rename to testing/drivers/crypto/Kconfig diff --git a/testing/crypto/Make.defs b/testing/drivers/crypto/Make.defs similarity index 91% rename from testing/crypto/Make.defs rename to testing/drivers/crypto/Make.defs index 5d0dee361..d75daad95 100644 --- a/testing/crypto/Make.defs +++ b/testing/drivers/crypto/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/crypto/Make.defs +# apps/testing/drivers/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/drivers/crypto endif diff --git a/testing/crypto/Makefile b/testing/drivers/crypto/Makefile similarity index 98% rename from testing/crypto/Makefile rename to testing/drivers/crypto/Makefile index 825eac407..64c6dfac7 100644 --- a/testing/crypto/Makefile +++ b/testing/drivers/crypto/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/crypto/Makefile +# apps/testing/drivers/crypto/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/crypto/aescbc.c b/testing/drivers/crypto/aescbc.c similarity index 99% rename from testing/crypto/aescbc.c rename to testing/drivers/crypto/aescbc.c index 0c9f464eb..c807cb151 100644 --- a/testing/crypto/aescbc.c +++ b/testing/drivers/crypto/aescbc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/crypto/aescbc.c + * apps/testing/drivers/crypto/aescbc.c * * SPDX-License-Identifier: ISC * SPDX-FileCopyrightText: 2005 Markus Friedl. All rights reserved. diff --git a/testing/crypto/aescmac.c b/testing/drivers/crypto/aescmac.c similarity index 99% rename from testing/crypto/aescmac.c rename to testing/drivers/crypto/aescmac.c index 0e0f57838..0874e9958 100644 --- a/testing/crypto/aescmac.c +++ b/testing/drivers/crypto/aescmac.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/crypto/aescmac.c + * apps/testing/drivers/crypto/aescmac.c * * SPDX-License-Identifier: ISC * diff --git a/testing/crypto/aesctr.c b/testing/drivers/crypto/aesctr.c similarity index 99% rename from testing/crypto/aesctr.c rename to testing/drivers/crypto/aesctr.c index bf1d99144..25bbc8600 100644 --- a/testing/crypto/aesctr.c +++ b/testing/drivers/crypto/aesctr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/crypto/aesctr.c + * apps/testing/drivers/crypto/aesctr.c * * SPDX-License-Identifier: ISC * SPDX-FileCopyrightText: 2005 Markus Friedl diff --git a/testing/crypto/aesxts.c b/testing/drivers/crypto/aesxts.c similarity index 99% rename from testing/crypto/aesxts.c rename to testing/drivers/crypto/aesxts.c index 1692af6bf..bcae79ad4 100644 --- a/testing/crypto/aesxts.c +++ b/testing/drivers/crypto/aesxts.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/crypto/aesxts.c + * apps/testing/drivers/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/drivers/crypto/crc32.c similarity index 99% rename from testing/crypto/crc32.c rename to testing/drivers/crypto/crc32.c index 9fa227c5d..f21fd8d28 100644 --- a/testing/crypto/crc32.c +++ b/testing/drivers/crypto/crc32.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/crypto/crc32.c + * apps/testing/drivers/crypto/crc32.c * * SPDX-License-Identifier: ISC * diff --git a/testing/crypto/dhm.c b/testing/drivers/crypto/dhm.c similarity index 99% rename from testing/crypto/dhm.c rename to testing/drivers/crypto/dhm.c index 038376104..f1eafa2d7 100644 --- a/testing/crypto/dhm.c +++ b/testing/drivers/crypto/dhm.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/crypto/dhm.c + * apps/testing/drivers/crypto/dhm.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/crypto/ecdsa.c b/testing/drivers/crypto/ecdsa.c similarity index 99% rename from testing/crypto/ecdsa.c rename to testing/drivers/crypto/ecdsa.c index 007b93b77..d97f7308b 100644 --- a/testing/crypto/ecdsa.c +++ b/testing/drivers/crypto/ecdsa.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/crypto/ecdsa.c + * apps/testing/drivers/crypto/ecdsa.c * * SPDX-License-Identifier: ISC * diff --git a/testing/crypto/hash.c b/testing/drivers/crypto/hash.c similarity index 99% rename from testing/crypto/hash.c rename to testing/drivers/crypto/hash.c index 1c3d6e6ee..a4688124e 100644 --- a/testing/crypto/hash.c +++ b/testing/drivers/crypto/hash.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/crypto/hash.c + * apps/testing/drivers/crypto/hash.c * * SPDX-License-Identifier: ISC * diff --git a/testing/crypto/hmac.c b/testing/drivers/crypto/hmac.c similarity index 99% rename from testing/crypto/hmac.c rename to testing/drivers/crypto/hmac.c index 48ea6ae46..10f0f12ac 100644 --- a/testing/crypto/hmac.c +++ b/testing/drivers/crypto/hmac.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/crypto/hmac.c + * apps/testing/drivers/crypto/hmac.c * * SPDX-License-Identifier: ISC * SPDX-FileCopyrightText: 2008 Damien Bergamini diff --git a/testing/crypto/rsa.c b/testing/drivers/crypto/rsa.c similarity index 99% rename from testing/crypto/rsa.c rename to testing/drivers/crypto/rsa.c index e4fe7778a..462aa2fc1 100644 --- a/testing/crypto/rsa.c +++ b/testing/drivers/crypto/rsa.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/crypto/rsa.c + * apps/testing/drivers/crypto/rsa.c * * SPDX-License-Identifier: ISC * diff --git a/testing/setest/CMakeLists.txt b/testing/drivers/setest/CMakeLists.txt similarity index 96% rename from testing/setest/CMakeLists.txt rename to testing/drivers/setest/CMakeLists.txt index 27235b435..7f06251a0 100644 --- a/testing/setest/CMakeLists.txt +++ b/testing/drivers/setest/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/setest/CMakeLists.txt +# apps/testing/drivers/setest/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/setest/Kconfig b/testing/drivers/setest/Kconfig similarity index 100% rename from testing/setest/Kconfig rename to testing/drivers/setest/Kconfig diff --git a/testing/setest/Make.defs b/testing/drivers/setest/Make.defs similarity index 91% rename from testing/setest/Make.defs rename to testing/drivers/setest/Make.defs index 701bb5f0a..e2f7213d2 100644 --- a/testing/setest/Make.defs +++ b/testing/drivers/setest/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/setest/Make.defs +# apps/testing/drivers/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/drivers/setest endif diff --git a/testing/setest/Makefile b/testing/drivers/setest/Makefile similarity index 96% rename from testing/setest/Makefile rename to testing/drivers/setest/Makefile index 594455749..627bc5dc7 100644 --- a/testing/setest/Makefile +++ b/testing/drivers/setest/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/setest/Makefile +# apps/testing/drivers/setest/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/setest/setest.c b/testing/drivers/setest/setest.c similarity index 99% rename from testing/setest/setest.c rename to testing/drivers/setest/setest.c index f16fca4a1..4ac3e3c88 100644 --- a/testing/setest/setest.c +++ b/testing/drivers/setest/setest.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/setest/setest.c + * apps/testing/drivers/setest/setest.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/testing/open_memstream/CMakeLists.txt b/testing/libc/open_memstream/CMakeLists.txt similarity index 95% rename from testing/open_memstream/CMakeLists.txt rename to testing/libc/open_memstream/CMakeLists.txt index 67a764030..b4bc301b2 100644 --- a/testing/open_memstream/CMakeLists.txt +++ b/testing/libc/open_memstream/CMakeLists.txt @@ -1,5 +1,5 @@ # ############################################################################## -# apps/testing/open_memstream/CMakeLists.txt +# apps/testing/libc/open_memstream/CMakeLists.txt # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/open_memstream/Kconfig b/testing/libc/open_memstream/Kconfig similarity index 100% rename from testing/open_memstream/Kconfig rename to testing/libc/open_memstream/Kconfig diff --git a/testing/open_memstream/Make.defs b/testing/libc/open_memstream/Make.defs similarity index 90% rename from testing/open_memstream/Make.defs rename to testing/libc/open_memstream/Make.defs index f16c7d494..f381082cc 100644 --- a/testing/open_memstream/Make.defs +++ b/testing/libc/open_memstream/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/open_memstream/Make.defs +# apps/testing/libc/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/libc/open_memstream endif diff --git a/testing/open_memstream/Makefile b/testing/libc/open_memstream/Makefile similarity index 96% rename from testing/open_memstream/Makefile rename to testing/libc/open_memstream/Makefile index 5759cac9f..2882fb010 100644 --- a/testing/open_memstream/Makefile +++ b/testing/libc/open_memstream/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/testing/open_memstream/Makefile +# apps/testing/libc/open_memstream/Makefile # # SPDX-License-Identifier: Apache-2.0 # diff --git a/testing/open_memstream/open_memstream.c b/testing/libc/open_memstream/open_memstream.c similarity index 99% rename from testing/open_memstream/open_memstream.c rename to testing/libc/open_memstream/open_memstream.c index b6f9d59c9..2c6e59177 100644 --- a/testing/open_memstream/open_memstream.c +++ b/testing/libc/open_memstream/open_memstream.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/testing/open_memstream/open_memstream.c + * apps/testing/libc/open_memstream/open_memstream.c * * SPDX-License-Identifier: Apache-2.0 *