From e6ee26fe07ba07ad21a00828f777755cc14f9fb3 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 17 Aug 2022 13:31:02 +0200 Subject: [PATCH] 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 Task-number: QTBUG-96056 Change-Id: Ic69ef938cb9319fa9a0eb063046b009de34bebc1 Reviewed-by: Toni Saario (cherry picked from commit 74d6ca276830969b151e168d0fd8a26ac4ec361c) Reviewed-by: Qt Cherry-pick Bot --- coin/instructions/coin_module_build_template_v2.yaml | 2 +- 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 5ed27515fbc..ed832a1720c 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 4dee84fac9f..45e79c210b8 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