summaryrefslogtreecommitdiffstats
path: root/coin/instructions/cmake_build_and_upload_test_artifacts_target.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'coin/instructions/cmake_build_and_upload_test_artifacts_target.yaml')
-rw-r--r--coin/instructions/cmake_build_and_upload_test_artifacts_target.yaml29
1 files changed, 22 insertions, 7 deletions
diff --git a/coin/instructions/cmake_build_and_upload_test_artifacts_target.yaml b/coin/instructions/cmake_build_and_upload_test_artifacts_target.yaml
index b34d408f4a..afc20b98a9 100644
--- a/coin/instructions/cmake_build_and_upload_test_artifacts_target.yaml
+++ b/coin/instructions/cmake_build_and_upload_test_artifacts_target.yaml
@@ -16,14 +16,29 @@ instructions:
variableName: INSTALL_DIR_FOR_CMAKE_TESTS
variableValue: "{{.InstallDir}}/target"
disable_if:
- condition: property
- property: host.os
- equals_value: Windows
+ condition: or
+ conditions:
+ - condition: property
+ property: host.os
+ equals_value: Windows
+ - condition: and
+ conditions:
+ - condition: property
+ property: target.osVersion
+ equals_value: Android_ANY
+ - condition: property
+ property: target.arch
+ equals_value: Multi
- type: EnvironmentVariable
variableName: COIN_CMAKE_ARGS
- variableValue: "{{.Env.TARGET_TEST_CONFIGURE_ARGS}}"
+ variableValue: "{{.Env.COMMON_TARGET_TEST_CMAKE_ARGS}}"
- !include "{{qt/qtbase}}/cmake_build_and_upload_test_artifacts.yaml"
disable_if:
- condition: property
- property: features
- contains_value: DisableTests
+ condition: or
+ conditions:
+ - condition: property
+ property: features
+ contains_value: DisableTests
+ - condition: property
+ property: features
+ contains_value: DoNotBuildTests