diff options
author | Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> | 2021-10-14 11:13:13 +0300 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-10-28 11:52:53 +0000 |
commit | 8a0f13d7aead4beb4466c6e69d6cb5182aae64ba (patch) | |
tree | f0e54b4da91862c6709562833d8ffa9e8f05152d | |
parent | 1c7bb0892a18e2f189cf4e03ab510c468f32a52e (diff) |
CI: Move QNX qemu specific configurations to own file
Task-number: QTBUG-87628
Change-Id: Ifc360071a08304270d75a505eecbd9c2da635c00
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 0b97c457a8ea0ecdc19302a0cd216ef855b5b131)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | coin/platform_configs/cmake_platforms.yaml | 34 | ||||
-rw-r--r-- | coin/platform_configs/cmake_platforms_qemu_qnx710.yaml | 39 |
2 files changed, 40 insertions, 33 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index dca1a20b..af9579ac 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -1,6 +1,7 @@ Version: 2 Include: [ cmake_platforms_qemu.yaml, + cmake_platforms_qemu_qnx710.yaml, cmake_platforms_target_android_host_linux.yaml, cmake_platforms_target_android_host_macos.yaml, cmake_platforms_target_android_host_windows.yaml, @@ -142,36 +143,3 @@ Configurations: Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache' Environment variables: ['Path={{.Env.MINGW810}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache','LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'] -- - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' - Target os: 'QNX_710' - Target arch: 'x86_64' - Compiler: 'GCC' - Target compiler: 'QCC' - Platform dependency: 'Ubuntu-20.04-host' - Features: ['Sccache', 'DisableTests'] - Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-DFEATURE_dbus=OFF -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake', - 'NON_QTBASE_TARGET_CONFIGURE_ARGS='] -- - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' - Target os: 'QNX_710' - Target arch: 'arm64' - Compiler: 'GCC' - Target compiler: 'QCC' - Platform dependency: 'Ubuntu-20.04-host' - Features: ['Sccache', 'DisableTests'] - Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-DFEATURE_dbus=OFF -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake', - 'NON_QTBASE_TARGET_CONFIGURE_ARGS='] -- - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' - Target os: 'QNX_710' - Target arch: 'armv7' - Compiler: 'GCC' - Target compiler: 'QCC' - Platform dependency: 'Ubuntu-20.04-host' - Features: ['Sccache', 'DisableTests'] - Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-DFEATURE_dbus=OFF -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake', - 'NON_QTBASE_TARGET_CONFIGURE_ARGS='] diff --git a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml new file mode 100644 index 00000000..3a4b6bb8 --- /dev/null +++ b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml @@ -0,0 +1,39 @@ +Version: 2 +Configurations: +- + Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' + Target os: 'QNX_710' + Target arch: 'x86_64' + Compiler: 'GCC' + Target compiler: 'QCC' + Platform dependency: 'Ubuntu-20.04-host' + Features: ['Sccache', 'InsignificantTests'] + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-DQT_FEATURE_dbus=OFF -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake', + 'QT_CMAKE_DIR=/opt/cmake-3.21.1/bin', + "TESTARGS='{{.Env.QNX_QEMU_SSH}} LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen'", + "TESTRUNNER='python3 {{.SourceDir}}/coin_qnx_qemu_runner.py'", + "COIN_CTEST_RESULTSDIR=/home/qt/work", + 'NON_QTBASE_TARGET_CONFIGURE_ARGS='] +- + Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' + Target os: 'QNX_710' + Target arch: 'arm64' + Compiler: 'GCC' + Target compiler: 'QCC' + Platform dependency: 'Ubuntu-20.04-host' + Features: ['Sccache', 'DisableTests'] + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-DQT_FEATURE_dbus=OFF -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake', + 'NON_QTBASE_TARGET_CONFIGURE_ARGS='] +- + Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' + Target os: 'QNX_710' + Target arch: 'armv7' + Compiler: 'GCC' + Target compiler: 'QCC' + Platform dependency: 'Ubuntu-20.04-host' + Features: ['Sccache', 'DisableTests'] + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-DQT_FEATURE_dbus=OFF -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake', + 'NON_QTBASE_TARGET_CONFIGURE_ARGS='] |