1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Allow building and running tests targeting iOS in other repos

Browse Source 
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>
This commit is contained in:
Alexandru Croitor 2022-08-17 13:31:02 +02:00
parent e684c25b85
commit 74d6ca2768
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
coin/instructions/coin_module_build_template_v2.yaml
View File

@ -33,7 +33,7 @@ instructions:
enable_if: enable_if:
condition: property condition: property
property: target.osVersion property: target.osVersion
in_values: [Android_ANY, QEMU, INTEGRITY, QNX_710] in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, INTEGRITY]
enable_if: enable_if:
condition: or condition: or
conditions: conditions:

5
coin/instructions/coin_module_test_template_v3.yaml
View File

@ -14,10 +14,7 @@ instructions:
equals_property: target.os equals_property: target.os
- condition: property - condition: property
property: target.osVersion property: target.osVersion
in_values: [QEMU, QNX_710] in_values: [QEMU, QNX_710, IOS_ANY]
- condition: property
property: target.osVersion
equals_value: IOS_ANY
- condition: property - condition: property
property: features property: features
contains_value: AndroidTestRun contains_value: AndroidTestRun