1 files changed, 18 insertions, 4 deletions
diff --git a/coin/instructions/cmake_build_and_upload_test_artifacts.yaml b/coin/instructions/cmake_build_and_upload_test_artifacts.yaml
index 1b0288d370..7fa663e4d2 100644
--- a/coin/instructions/cmake_build_and_upload_test_artifacts.yaml
+++ b/coin/instructions/cmake_build_and_upload_test_artifacts.yaml
@@ -10,14 +10,14 @@ instructions:
     directory: "{{.BuildDir}}"
   - type: AppendToEnvironmentVariable
     variableName: COIN_CMAKE_ARGS
-    variableValue: " -DCMAKE_AUTOGEN_VERBOSE=ON -S {{.SourceDir}} -B ."
+    variableValue: " -S {{.SourceDir}} -B ."
     disable_if:
       condition: runtime
       env_var: COIN_CMAKE_ARGS
       equals_value: null
   - type: EnvironmentVariable
     variableName: COIN_CMAKE_ARGS
-    variableValue: "-DCMAKE_AUTOGEN_VERBOSE=ON -S {{.SourceDir}} -B ."
+    variableValue: "-S {{.SourceDir}} -B ."
     enable_if:
       condition: runtime
       env_var: COIN_CMAKE_ARGS
@@ -48,15 +48,29 @@ instructions:
       property: features
       contains_value: "MinimalStaticTests"
 
+  # Inform CMake to build just a minimal set of tests for Android multi-ABI Qt builds.
+  - type: AppendToEnvironmentVariable
+    variableName: COIN_CMAKE_ARGS
+    variableValue: " -DQT_BUILD_MINIMAL_ANDROID_MULTI_ABI_TESTS=ON"
+    enable_if:
+      condition: property
+      property: features
+      contains_value: "MinimalAndroidMultiABITests"
+
   - !include "{{qt/qtbase}}/call_cmake_for_standalone_tests.yaml"
   - type: ExecuteCommand
     command: "{{.Env.TESTS_ENV_PREFIX}} cmake --build . --parallel -v"
     maxTimeInSeconds: 6000
-    maxTimeBetweenOutput: 1200
+    maxTimeBetweenOutput: 4800
     userMessageOnFailure: >
-      Failed to build sources. In the current state bug can be everywhere.
+      Failed to build sources.
   - type: UploadTestArtifact
     transferType: UploadModuleTestsArtifact
     archiveDirectory: "{{.BuildDir}}"
     maxTimeInSeconds: 1200
     maxTimeBetweenOutput: 1200
+    # INTEGRITY artifacts aren't used.
+    disable_if:
+      condition: property
+      property: target.osVersion
+      equals_value: INTEGRITY