From da22402d5f5645ab750c59934d8cbd65b4517b20 Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Wed, 12 Jun 2024 10:04:22 +0200 Subject: [PATCH 1/3] all.sh: Fix clean-up of Makefiles generated by CMake Signed-off-by: Ronald Cron --- tests/scripts/all.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index 3ce8ebb9d..74ad16852 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -327,8 +327,9 @@ cleanup() -iname CTestTestfile.cmake -o \ -iname CMakeCache.txt -o \ -path './cmake/*.cmake' \) -exec rm -f {} \+ - # Recover files overwritten by in-tree CMake builds - rm -f include/Makefile include/mbedtls/Makefile programs/!(fuzz)/Makefile + # Remove Makefiles generated by in-tree CMake builds + rm -f 3rdparty/Makefile 3rdparty/*/Makefile pkgconfig/Makefile framework/Makefile + rm -f include/Makefile programs/!(fuzz)/Makefile # Remove any artifacts from the component_test_cmake_as_subdirectory test. rm -rf programs/test/cmake_subproject/build From 2b22b1e87091e3d073222a7d6df8a45489a6dedb Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Wed, 12 Jun 2024 10:45:37 +0200 Subject: [PATCH 2/3] Add and update some .gitignore files Signed-off-by: Ronald Cron --- .gitignore | 3 +++ 3rdparty/p256-m/.gitignore | 1 + pkgconfig/.gitignore | 2 ++ programs/test/cmake_package/.gitignore | 1 + programs/test/cmake_package_install/.gitignore | 1 + 5 files changed, 8 insertions(+) create mode 100644 3rdparty/p256-m/.gitignore create mode 100644 pkgconfig/.gitignore diff --git a/.gitignore b/.gitignore index 12c775dff..6068cbca7 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,9 @@ seedfile # MBEDTLS_PSA_INJECT_ENTROPY seed file created by the test framework 00000000ffffff52.psa_its +# Log files created by all.sh to reduce the logs in case a component runs +# successfully +quiet-make.* # CMake build artifacts: CMakeCache.txt diff --git a/3rdparty/p256-m/.gitignore b/3rdparty/p256-m/.gitignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/3rdparty/p256-m/.gitignore @@ -0,0 +1 @@ +Makefile diff --git a/pkgconfig/.gitignore b/pkgconfig/.gitignore new file mode 100644 index 000000000..5460c2076 --- /dev/null +++ b/pkgconfig/.gitignore @@ -0,0 +1,2 @@ +Makefile +*.pc diff --git a/programs/test/cmake_package/.gitignore b/programs/test/cmake_package/.gitignore index 9ae6b59c4..89d8c2bf6 100644 --- a/programs/test/cmake_package/.gitignore +++ b/programs/test/cmake_package/.gitignore @@ -1,3 +1,4 @@ build Makefile cmake_package +mbedtls diff --git a/programs/test/cmake_package_install/.gitignore b/programs/test/cmake_package_install/.gitignore index b9b828288..aaa594209 100644 --- a/programs/test/cmake_package_install/.gitignore +++ b/programs/test/cmake_package_install/.gitignore @@ -1,3 +1,4 @@ build Makefile cmake_package_install +mbedtls From 57587493476800246a5d1dd7dcb5e94cd41c02a7 Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Tue, 18 Jun 2024 09:17:52 +0200 Subject: [PATCH 3/3] Update framework Signed-off-by: Ronald Cron --- framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework b/framework index 623c1b453..c663fa8ec 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 623c1b4532e8de64a5d82ea84a7496e64c370d15 +Subproject commit c663fa8ece1dfee830da096ae872547d23543e60