diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-08-17 13:31:02 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-08-17 17:02:27 +0200 |
| commit | 74d6ca276830969b151e168d0fd8a26ac4ec361c (patch) | |
| tree | 0cb6732e7643fcf710d020717b88e23000644f84 /coin | |
| parent | e684c25b859cfa1cf2cd93c8c9be374ee6f6a289 (diff) | |
CMake: Allow building and running tests targeting iOS in other repos
Allow building iOS tests in other repos, if DisableTests is not
specified.
The reordering in coin_module_build_template_v2.yaml is done to match
the same order that's in coin_qtbase_build_template_v2.yaml.
The change in coin_module_test_template_v3.yaml is just cosmetic.
Amends 80705298ca11587782beed49c4ae55f533cfc0c2
Pick-to: 6.4
Task-number: QTBUG-96056
Change-Id: Ic69ef938cb9319fa9a0eb063046b009de34bebc1
Reviewed-by: Toni Saario <toni.saario@qt.io>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/instructions/coin_module_build_template_v2.yaml | 2 | ||||
| -rw-r--r-- | coin/instructions/coin_module_test_template_v3.yaml | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/coin/instructions/coin_module_build_template_v2.yaml b/coin/instructions/coin_module_build_template_v2.yaml index 5ed27515fb..ed832a1720 100644 --- a/coin/instructions/coin_module_build_template_v2.yaml +++ b/coin/instructions/coin_module_build_template_v2.yaml @@ -33,7 +33,7 @@ instructions: enable_if: condition: property property: target.osVersion - in_values: [Android_ANY, QEMU, INTEGRITY, QNX_710] + in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, INTEGRITY] enable_if: condition: or conditions: diff --git a/coin/instructions/coin_module_test_template_v3.yaml b/coin/instructions/coin_module_test_template_v3.yaml index 4dee84fac9..45e79c210b 100644 --- a/coin/instructions/coin_module_test_template_v3.yaml +++ b/coin/instructions/coin_module_test_template_v3.yaml @@ -14,10 +14,7 @@ instructions: equals_property: target.os - condition: property property: target.osVersion - in_values: [QEMU, QNX_710] - - condition: property - property: target.osVersion - equals_value: IOS_ANY + in_values: [QEMU, QNX_710, IOS_ANY] - condition: property property: features contains_value: AndroidTestRun |