From 92ae4071dd221f17ffeb29bcc6ca720b31c45c7b Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 9 Jun 2023 11:57:26 +0000 Subject: [PATCH] Add feature to disable building tests IFW requires static build of Qt which does not build tests on all configurations. This allows building modules without them building tests. Previously IFW used 5.15 repos, those build tests in test workitem, not running into the issue. This is only relevant if the tested repo i.e IFW implements it's own test instructions. Change-Id: I1e03f3b577d7be314f92ed3989e5f6daf2a46da1 Reviewed-by: Toni Saario (cherry picked from commit 409aa8d097a424c6281653d8c4dc3bc1c46054ed) Reviewed-by: Qt Cherry-pick Bot --- .../cmake_build_and_upload_test_artifacts_host.yaml | 11 ++++++++--- .../cmake_build_and_upload_test_artifacts_target.yaml | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/coin/instructions/cmake_build_and_upload_test_artifacts_host.yaml b/coin/instructions/cmake_build_and_upload_test_artifacts_host.yaml index 3592ac42702..bc16368fc2d 100644 --- a/coin/instructions/cmake_build_and_upload_test_artifacts_host.yaml +++ b/coin/instructions/cmake_build_and_upload_test_artifacts_host.yaml @@ -13,6 +13,11 @@ instructions: variableValue: "{{.Env.COMMON_TEST_CMAKE_ARGS}}" - !include "{{qt/qtbase}}/cmake_build_and_upload_test_artifacts.yaml" disable_if: - condition: property - property: features - contains_value: DisableTests + condition: or + conditions: + - condition: property + property: features + contains_value: DisableTests + - condition: property + property: features + contains_value: DoNotBuildTests diff --git a/coin/instructions/cmake_build_and_upload_test_artifacts_target.yaml b/coin/instructions/cmake_build_and_upload_test_artifacts_target.yaml index be4db4f64e2..afc20b98a91 100644 --- a/coin/instructions/cmake_build_and_upload_test_artifacts_target.yaml +++ b/coin/instructions/cmake_build_and_upload_test_artifacts_target.yaml @@ -34,6 +34,11 @@ instructions: variableValue: "{{.Env.COMMON_TARGET_TEST_CMAKE_ARGS}}" - !include "{{qt/qtbase}}/cmake_build_and_upload_test_artifacts.yaml" disable_if: - condition: property - property: features - contains_value: DisableTests + condition: or + conditions: + - condition: property + property: features + contains_value: DisableTests + - condition: property + property: features + contains_value: DoNotBuildTests