summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2022-09-06 17:27:39 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2022-09-07 17:16:16 +0200
commit6c04df32951c41fe89c2096a8e488281f1ae23aa (patch)
treebc7c6174f9213418905faba79ae77f446af1d0b1
parentd1459e99bd42b7e98e2e3429cdcae2806e5d1918 (diff)
CMake: Don't build iOS auto tests when QT_BUILD_MINIMAL_STATIC_TEST
is set, so that integrations don't fail. In the future we might add build-only tests like we have in qtbase. Task-number: QTBUG-96056 Change-Id: I84ccc93eb02b807702117b814d4969ccec62ffe2 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit d7f621d3d3e740a53ddc807aff673b4f6843bf3a) Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--tests/auto/CMakeLists.txt9
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index b671097..aab5a8c 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -1,4 +1,11 @@
-# Generated from auto.pro.
+
+# For now, don't built auto tests when QT_BUILD_MINIMAL_STATIC_TEST
+# is specified and the build is targeting iOS. QT_BUILD_MINIMAL_STATIC_TEST is used in our CI.
+# Regular non-cmake build tests shouldn't be built because the CI will try to run them and fail
+# due to missing simulator support.
+if(IOS AND QT_BUILD_MINIMAL_STATIC_TESTS)
+ return()
+endif()
add_subdirectory(tga)
add_subdirectory(wbmp)