mirror of
git://code.qt.io/qt/qt5.git
synced 2026-06-22 03:17:31 +08:00
Build WoA arm64 tests natively using the cross-built toolchain
Rename windows-11-x86_64-arm64-tests to
windows-11-x86_64-arm64-native-tests and switch it from the host-side
cross-compile-tests flow to the native-build-tests flow:
* Features BuildTestsInTest + UseToolchainFromTargetDir build tests in
the test stage on the arm64 worker using the cross-built toolchain
(qtbase change 238400b22f3b327c05a51a913b279d4bf37f4adf).
* OpenSSL and FFmpeg env vars unblock qtnetwork and qtmultimedia.
Change-Id: Idd0565ceee0714d3f4fbe34ebf8d6373f7315cc1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 2b6e156008)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
committed by
Qt Cherry-pick Bot
parent
fe37644291
commit
a35ee9f428
@@ -298,12 +298,21 @@ Configurations:
|
||||
'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}',
|
||||
]
|
||||
-
|
||||
Id: 'windows-11-x86_64-arm64-tests'
|
||||
Id: 'windows-11-x86_64-arm64-native-tests'
|
||||
Template: 'qtci-windows-11_23H2-aarch64-53'
|
||||
Compiler: 'MSVC2022'
|
||||
Features: ['TestOnly']
|
||||
Features: ['TestOnly', 'BuildTestsInTest', 'UseToolchainFromTargetDir']
|
||||
Configure arguments: '-cross-compiled'
|
||||
Platform dependency: 'windows-11_24H2-msvc2022-arm64'
|
||||
Environment variables: [
|
||||
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}',
|
||||
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
|
||||
'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}',
|
||||
'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
|
||||
'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}',
|
||||
'VCPKG_HOST_TRIPLET=arm64-windows-qt',
|
||||
'VCPKG_TARGET_TRIPLET=arm64-windows-qt',
|
||||
]
|
||||
-
|
||||
Id: 'windows-11-x86_64-msvc2026-arm64-tests'
|
||||
Template: 'qtci-windows-11_23H2-aarch64-54'
|
||||
|
||||
Reference in New Issue
Block a user