coin: Simplify build conditions and allow WebAssembly non-qtbase repos

Rather than using multiple layers of negation, we can just specify a
list of allowed configs.

Allow cross-building other repos when targeting WebAssembly.

Be explicit about not building Android tests for repos other than
qtbase (until that is not longer desired).
Currently the qt5 platform configuration only has qtbase marked
with the AndroidTestRun feature.

Amends fd16c65b7e
Amends 13c460d0ff
Superseeds 60a5b7be03f5800caa8a117c3b07b60d8fb208ec

Change-Id: If8de002e0c9f748b43e3d2271ac283462603b2e6
Reviewed-by: Toni Saario <toni.saario@qt.io>
bb10
Alexandru Croitor 2021-04-09 18:06:57 +02:00
parent e90dda7314
commit 6e378b6efd
1 changed files with 8 additions and 17 deletions

View File

@ -20,7 +20,7 @@ instructions:
equals_property: target.os
- condition: property
property: target.osVersion
not_equals_value: QEMU
not_in_values: [QEMU, WebAssembly]
- type: Group
instructions:
- !include "{{qt/qtbase}}/cmake_cross_compilation_module_build_instructions.yaml"
@ -28,20 +28,11 @@ instructions:
instructions:
- !include "{{qt/qtbase}}/cmake_build_and_upload_test_artifacts_target.yaml"
enable_if:
condition: and
conditions:
- condition: property
property: host.os
equals_property: target.os
- condition: property
property: target.osVersion
equals_value: QEMU
disable_if:
condition: and
conditions:
- condition: property
property: host.os
equals_property: target.os
- condition: property
condition: property
property: target.osVersion
not_equals_value: QEMU
# We don't currently build tests for Android other than qtbase repo
in_values: [QEMU]
enable_if:
condition: property
property: target.osVersion
in_values: [IOS_ANY, Android_ANY, QEMU, QNX_710, WebAssembly]