commit 6c979856c3533f1d9f8abca39e0f37ebd7ac438b
author David Horstmann <david.horstmann@arm.com> Thu Sep 28 10:40:22 2023 +0100
committer David Horstmann <david.horstmann@arm.com> Thu Sep 28 11:30:43 2023 +0100
tree c769f7ba51f362fc673805ab88812fb385c93573
parent 862abe2d0fa74b1e39b7e409a4f3b8ed736732e7

Remove generated files in all cmake_as_x tests

Signed-off-by: David Horstmann <david.horstmann@arm.com>

programs/test/cmake_package/CMakeLists.txt

diff --git a/programs/test/cmake_package/CMakeLists.txt b/programs/test/cmake_package/CMakeLists.txt
index 019e6e7..f498cf9 100644
--- a/programs/test/cmake_package/CMakeLists.txt
+++ b/programs/test/cmake_package/CMakeLists.txt
@@ -13,7 +13,9 @@
         "-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}"

programs/test/cmake_package_install/CMakeLists.txt

diff --git a/programs/test/cmake_package_install/CMakeLists.txt b/programs/test/cmake_package_install/CMakeLists.txt
index 6070a6c..6937af4 100644
--- a/programs/test/cmake_package_install/CMakeLists.txt
+++ b/programs/test/cmake_package_install/CMakeLists.txt
@@ -15,6 +15,8 @@
         "-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(

tests/scripts/all.sh

diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index ddabe12..41cd139 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -5222,8 +5222,13 @@
 }
 
 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 @@
 }
 
 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