diff options
| author | David Horstmann <david.horstmann@arm.com> | 2023-09-28 12:40:22 +0300 |
|---|---|---|
| committer | David Horstmann <david.horstmann@arm.com> | 2023-09-28 13:30:43 +0300 |
| commit | 6c979856c3533f1d9f8abca39e0f37ebd7ac438b (patch) | |
| tree | c769f7ba51f362fc673805ab88812fb385c93573 | |
| parent | 862abe2d0fa74b1e39b7e409a4f3b8ed736732e7 (diff) | |
Remove generated files in all cmake_as_x tests
Signed-off-by: David Horstmann <david.horstmann@arm.com>
| -rw-r--r-- | programs/test/cmake_package/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | programs/test/cmake_package_install/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | tests/scripts/all.sh | 10 |
3 files changed, 15 insertions, 1 deletions
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 |