summaryrefslogtreecommitdiffstats
path: root/coin/instructions/cmake_setup_running_tests_env_vars.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'coin/instructions/cmake_setup_running_tests_env_vars.yaml')
-rw-r--r--coin/instructions/cmake_setup_running_tests_env_vars.yaml16
1 files changed, 14 insertions, 2 deletions
diff --git a/coin/instructions/cmake_setup_running_tests_env_vars.yaml b/coin/instructions/cmake_setup_running_tests_env_vars.yaml
index f2c290a3df..c1a83eae07 100644
--- a/coin/instructions/cmake_setup_running_tests_env_vars.yaml
+++ b/coin/instructions/cmake_setup_running_tests_env_vars.yaml
@@ -50,7 +50,7 @@ instructions:
equals_property: target.os
- condition: property
property: target.osVersion
- not_equals_value: QEMU
+ not_in_values: [QEMU, QNX_710]
- type: Group
instructions:
- type: EnvironmentVariable
@@ -64,4 +64,16 @@ instructions:
equals_property: target.os
- condition: property
property: target.osVersion
- not_equals_value: QEMU
+ not_in_values: [QEMU, QNX_710]
+ - type: Group
+ instructions:
+ - !include "{{qt/qtbase}}/cmake_setup_running_qnxqemu_tests_env_vars.yaml"
+ enable_if:
+ condition: and
+ conditions:
+ - condition: property
+ property: target.osVersion
+ equals_value: QNX_710
+ - condition: property
+ property: features
+ not_contains_value: DisableTests