summaryrefslogtreecommitdiffstats
path: root/coin/instructions/cmake_build_and_upload_test_artifacts_host.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'coin/instructions/cmake_build_and_upload_test_artifacts_host.yaml')
-rw-r--r--coin/instructions/cmake_build_and_upload_test_artifacts_host.yaml14
1 files changed, 11 insertions, 3 deletions
diff --git a/coin/instructions/cmake_build_and_upload_test_artifacts_host.yaml b/coin/instructions/cmake_build_and_upload_test_artifacts_host.yaml
index e2cdd15407..bc16368fc2 100644
--- a/coin/instructions/cmake_build_and_upload_test_artifacts_host.yaml
+++ b/coin/instructions/cmake_build_and_upload_test_artifacts_host.yaml
@@ -8,8 +8,16 @@ instructions:
- type: EnvironmentVariable
variableName: INSTALL_DIR_FOR_CMAKE_TESTS
variableValue: "{{.InstallDir}}"
+ - type: EnvironmentVariable
+ variableName: COIN_CMAKE_ARGS
+ variableValue: "{{.Env.COMMON_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