From b7b4f23c3826b3024d4c9606c9e9079eca75ab2e Mon Sep 17 00:00:00 2001 From: David Horstmann Date: Wed, 27 Sep 2023 13:57:11 +0100 Subject: [PATCH 1/5] Add CMake include path for generated header Now that we are generating psa_crypto_driver_wrappers.h, we need to pass build/library as an include directory. Signed-off-by: David Horstmann --- library/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index 65b957abfa..2b1fd43d15 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -323,7 +323,9 @@ foreach(target IN LISTS target_libraries) target_include_directories(${target} PUBLIC $ $ - PRIVATE ${MBEDTLS_DIR}/library/) + PRIVATE ${MBEDTLS_DIR}/library/ + # Needed to include psa_crypto_driver_wrappers.h + ${CMAKE_CURRENT_BINARY_DIR}) # Pass-through MBEDTLS_CONFIG_FILE and MBEDTLS_USER_CONFIG_FILE if(MBEDTLS_CONFIG_FILE) target_compile_definitions(${target} From 9f48fff4677fb7c8f4938923fb42cfddaeaf160f Mon Sep 17 00:00:00 2001 From: David Horstmann Date: Wed, 27 Sep 2023 15:53:54 +0100 Subject: [PATCH 2/5] Ensure tests will fail if CMake generation fails Remove the in-source-tree generated files before running CMake. Signed-off-by: David Horstmann --- tests/scripts/all.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index c85d4865ed..2322a982a3 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -5176,11 +5176,16 @@ support_test_cmake_out_of_source () { } component_test_cmake_out_of_source () { + # remove existing generated files so that we use the ones cmake + # generates + make neat + msg "build: cmake 'out-of-source' build" MBEDTLS_ROOT_DIR="$PWD" mkdir "$OUT_OF_SOURCE_DIR" cd "$OUT_OF_SOURCE_DIR" - cmake -D CMAKE_BUILD_TYPE:String=Check "$MBEDTLS_ROOT_DIR" + # Note: Explicitly generate files as these are turned off in releases + cmake -D CMAKE_BUILD_TYPE:String=Check -D GEN_FILES=ON "$MBEDTLS_ROOT_DIR" make msg "test: cmake 'out-of-source' build" @@ -5201,9 +5206,14 @@ component_test_cmake_out_of_source () { } component_test_cmake_as_subdirectory () { + # Remove existing generated files so that we use the ones CMake + # generates + make neat + msg "build: cmake 'as-subdirectory' build" cd programs/test/cmake_subproject - cmake . + # Note: Explicitly generate files as these are turned off in releases + cmake -D GEN_FILES=ON . make ./cmake_subproject } From 862abe2d0fa74b1e39b7e409a4f3b8ed736732e7 Mon Sep 17 00:00:00 2001 From: David Horstmann Date: Thu, 28 Sep 2023 10:42:10 +0100 Subject: [PATCH 3/5] Fix lowercase comment start Signed-off-by: David Horstmann --- tests/scripts/all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index 2322a982a3..ddabe12bd4 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -5176,7 +5176,7 @@ support_test_cmake_out_of_source () { } component_test_cmake_out_of_source () { - # remove existing generated files so that we use the ones cmake + # Remove existing generated files so that we use the ones cmake # generates make neat From 6c979856c3533f1d9f8abca39e0f37ebd7ac438b Mon Sep 17 00:00:00 2001 From: David Horstmann Date: Thu, 28 Sep 2023 10:40:22 +0100 Subject: [PATCH 4/5] Remove generated files in all cmake_as_x tests Signed-off-by: David Horstmann --- programs/test/cmake_package/CMakeLists.txt | 4 +++- programs/test/cmake_package_install/CMakeLists.txt | 2 ++ tests/scripts/all.sh | 10 ++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/programs/test/cmake_package/CMakeLists.txt b/programs/test/cmake_package/CMakeLists.txt index 019e6e7c0a..f498cf931d 100644 --- a/programs/test/cmake_package/CMakeLists.txt +++ b/programs/test/cmake_package/CMakeLists.txt @@ -13,7 +13,9 @@ execute_process( "-H${MbedTLS_SOURCE_DIR}" "-B${MbedTLS_BINARY_DIR}" "-DENABLE_PROGRAMS=NO" - "-DENABLE_TESTING=NO") + "-DENABLE_TESTING=NO" + # Turn on generated files explicitly in case this is a release + "-DGEN_FILES=ON") execute_process( COMMAND "${CMAKE_COMMAND}" diff --git a/programs/test/cmake_package_install/CMakeLists.txt b/programs/test/cmake_package_install/CMakeLists.txt index 6070a6c067..6937af4f66 100644 --- a/programs/test/cmake_package_install/CMakeLists.txt +++ b/programs/test/cmake_package_install/CMakeLists.txt @@ -15,6 +15,8 @@ execute_process( "-B${MbedTLS_BINARY_DIR}" "-DENABLE_PROGRAMS=NO" "-DENABLE_TESTING=NO" + # Turn on generated files explicitly in case this is a release + "-DGEN_FILES=ON" "-DCMAKE_INSTALL_PREFIX=${MbedTLS_INSTALL_DIR}") execute_process( diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index ddabe12bd4..41cd139536 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -5222,8 +5222,13 @@ support_test_cmake_as_subdirectory () { } component_test_cmake_as_package () { + # Remove existing generated files so that we use the ones CMake + # generates + make neat + msg "build: cmake 'as-package' build" cd programs/test/cmake_package + # Note: Explicitly generate files as these are turned off in releases cmake . make ./cmake_package @@ -5233,8 +5238,13 @@ support_test_cmake_as_package () { } component_test_cmake_as_package_install () { + # Remove existing generated files so that we use the ones CMake + # generates + make neat + msg "build: cmake 'as-installed-package' build" cd programs/test/cmake_package_install + # Note: Explicitly generate files as these are turned off in releases cmake . make ./cmake_package_install From f868d6f4e8f9e220c2903f49dd9784a3c418c5b4 Mon Sep 17 00:00:00 2001 From: David Horstmann Date: Thu, 28 Sep 2023 14:01:25 +0100 Subject: [PATCH 5/5] Remove spurious comments Signed-off-by: David Horstmann --- tests/scripts/all.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index 41cd139536..d9ceb96f56 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -5228,7 +5228,6 @@ component_test_cmake_as_package () { msg "build: cmake 'as-package' build" cd programs/test/cmake_package - # Note: Explicitly generate files as these are turned off in releases cmake . make ./cmake_package @@ -5244,7 +5243,6 @@ component_test_cmake_as_package_install () { msg "build: cmake 'as-installed-package' build" cd programs/test/cmake_package_install - # Note: Explicitly generate files as these are turned off in releases cmake . make ./cmake_package_install