Remove generated files in all cmake_as_x tests

Signed-off-by: David Horstmann <david.horstmann@arm.com>
This commit is contained in:
David Horstmann 2023-09-28 10:40:22 +01:00
parent 862abe2d0f
commit 6c979856c3
3 changed files with 15 additions and 1 deletions

View file

@ -13,7 +13,9 @@ execute_process(
"-H${MbedTLS_SOURCE_DIR}" "-H${MbedTLS_SOURCE_DIR}"
"-B${MbedTLS_BINARY_DIR}" "-B${MbedTLS_BINARY_DIR}"
"-DENABLE_PROGRAMS=NO" "-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( execute_process(
COMMAND "${CMAKE_COMMAND}" COMMAND "${CMAKE_COMMAND}"

View file

@ -15,6 +15,8 @@ execute_process(
"-B${MbedTLS_BINARY_DIR}" "-B${MbedTLS_BINARY_DIR}"
"-DENABLE_PROGRAMS=NO" "-DENABLE_PROGRAMS=NO"
"-DENABLE_TESTING=NO" "-DENABLE_TESTING=NO"
# Turn on generated files explicitly in case this is a release
"-DGEN_FILES=ON"
"-DCMAKE_INSTALL_PREFIX=${MbedTLS_INSTALL_DIR}") "-DCMAKE_INSTALL_PREFIX=${MbedTLS_INSTALL_DIR}")
execute_process( execute_process(

View file

@ -5222,8 +5222,13 @@ support_test_cmake_as_subdirectory () {
} }
component_test_cmake_as_package () { 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" msg "build: cmake 'as-package' build"
cd programs/test/cmake_package cd programs/test/cmake_package
# Note: Explicitly generate files as these are turned off in releases
cmake . cmake .
make make
./cmake_package ./cmake_package
@ -5233,8 +5238,13 @@ support_test_cmake_as_package () {
} }
component_test_cmake_as_package_install () { 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" msg "build: cmake 'as-installed-package' build"
cd programs/test/cmake_package_install cd programs/test/cmake_package_install
# Note: Explicitly generate files as these are turned off in releases
cmake . cmake .
make make
./cmake_package_install ./cmake_package_install