From 243d64cca2dc98ef87014a5c75376baf59aa4f88 Mon Sep 17 00:00:00 2001 From: Toni Saario Date: Thu, 20 Feb 2025 11:50:00 +0200 Subject: [PATCH] Build and run tests for windows arm cross-compilation Enables WOA test running in webengine. Which is unable to build the native WOA target. Add 'fake' configure argument -corss-compiled to so test instruction on native windows arm have a chance to bailout (qquickeffect maker is never cross-compiled) Task-number: COIN-1211 Change-Id: Ie920f65f9ec260c0c1a7111e495fd9a86adee5f6 Reviewed-by: Alexandru Croitor (cherry picked from commit 56e326ae31127526911126ef29e725b8aacdea82) --- coin/platform_configs/cmake_platforms.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index e9e658e1..51707a4d 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -155,7 +155,7 @@ Configurations: Template: 'qtci-windows-11_23H2-x86_64-54' Compiler: 'MSVC2022' Target arch: 'arm64' - Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] + Features: ['Sccache', 'DoNotRunTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Platform dependency: 'windows-10_22h2-mingw13' Environment variables: [ 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', @@ -167,6 +167,13 @@ Configurations: 'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', ] +- + Id: 'windows-11-x86_64-arm64-tests' + Template: 'qtci-windows-11_22H2-aarch64-55' + Compiler: 'MSVC2022' + Features: ['TestOnly'] + Configure arguments: '-no-opengl -cross-compiled' + Platform dependency: 'windows-11_23H2-msvc2022-arm64' - Id: 'windows-11_23H2-msvc2022-developer-build' Template: 'qtci-windows-11_23H2-x86_64-54'