diff options
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.yaml | 13 |
1 files changed, 9 insertions, 4 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 847d095da9..bc16368fc2 100644 --- a/coin/instructions/cmake_build_and_upload_test_artifacts_host.yaml +++ b/coin/instructions/cmake_build_and_upload_test_artifacts_host.yaml @@ -10,9 +10,14 @@ instructions: variableValue: "{{.InstallDir}}" - type: EnvironmentVariable variableName: COIN_CMAKE_ARGS - variableValue: "{{.Env.TEST_CONFIGURE_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 |