From f78195fc931acfed20911e2909be67b3b85bdaa0 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 22 Feb 2024 11:19:56 +0100 Subject: [PATCH] Run tests on offscreen mode for debian arm Debian arm only has Wayland, and there is no QtWayland QPA plugin available yet during the integration of each module. We can run offscreen mode for now. And enable tests on Wayland in qtwayland and qt5 integration. Pick-to: 6.6 6.5 Task-number: QTQAINFRA-5594 Change-Id: Ie06d0b88509f9e55c96ce3b05b18ff8cec672f6b Reviewed-by: Liang Qi (cherry picked from commit 23ce6f4378dfc2f1075376ad7198831b8d187342) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms.yaml | 15 +++++++++++++-- coin/platform_configs/qt5.yaml | 12 +++++++++++- coin/platform_configs/qtwayland.yaml | 10 ++++++++++ 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 20054f9f..b58e26fd 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -181,16 +181,27 @@ Configurations: 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' ] +# Build on Debian-11.6 and split test on Wayland and offscreen later - Id: 'debian-11.6-arm64' Template: 'qtci-linux-Debian-11.6-aarch64-50' Compiler: 'GCC' - Features: ['Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'InsignificantTests'] + Features: ['Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests'] Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-doubleconversion -qt-harfbuzz -no-libudev -bundled-xcb-xinput' Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY' ] - +# Test on Debian-11.6 offscreen +- + Id: 'debian-11.6-arm64-offscreen-tests' + Template: 'qtci-linux-Debian-11.6-aarch64-50' + Compiler: 'GCC' + Features: ['Sccache', 'InsignificantTests', 'TestOnly'] + Environment variables: [ + 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', + 'QT_QPA_PLATFORM=offscreen' + ] + Platform dependency: 'debian-11.6-arm64' - Id: 'ios-universal' Template: 'qtci-macos-13-x86_64-103' diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index a9157b9f..68171d9d 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -2,4 +2,14 @@ Version: 2 Include: [ cmake_platforms.yaml ] -Configurations: [] +Configurations: +# Test on Debian-11.6 Wayland +- + Id: 'debian-11.6-arm64-wayland-tests' + Template: 'qtci-linux-Debian-11.6-aarch64-50' + Compiler: 'GCC' + Features: ['Sccache', 'TestOnly', 'RunDependencyTests', 'InsignificantTests'] + Environment variables: [ + 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY' + ] + Platform dependency: 'debian-11.6-arm64' diff --git a/coin/platform_configs/qtwayland.yaml b/coin/platform_configs/qtwayland.yaml index a649dc92..a9ebf26f 100644 --- a/coin/platform_configs/qtwayland.yaml +++ b/coin/platform_configs/qtwayland.yaml @@ -16,3 +16,13 @@ Configurations: Compiler: 'GCC' Features: ['Sccache', 'TestOnly', 'RunDependencyTests', 'InsignificantTests'] Platform dependency: 'ubuntu-22.04' +# Test on Debian-11.6 Wayland +- + Id: 'debian-11.6-arm64-wayland-tests' + Template: 'qtci-linux-Debian-11.6-aarch64-50' + Compiler: 'GCC' + Features: ['Sccache', 'TestOnly', 'RunDependencyTests', 'InsignificantTests'] + Environment variables: [ + 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY' + ] + Platform dependency: 'debian-11.6-arm64'