Remove generated files in all cmake_as_x tests

Modified from original for backport without needing: - 687d1ab Makefile targets for automatically generated files Signed-off-by: David Horstmann <david.horstmann@arm.com> Signed-off-by: Bill Roberts <bill.roberts@arm.com>
Mbed-TLS · May 23, 2024 · 4fc5a64 · 4fc5a64
1 parent 4aa807a
commit 4fc5a64
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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
@@ -3532,6 +3532,7 @@ support_test_cmake_as_subdirectory () {
 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
@@ -3540,6 +3541,7 @@ component_test_cmake_as_package () {
 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