lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-17 17:56:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup of QNX Coin platform config

Browse Source 
Move TESTRUNNER setting to the coin platform config files in qtbase,
where it's configured for other platforms too.

Remove custom COIN_CTEST_RESULTSDIR. The build should put its
testresults logfiles where Coin expects them, and that is already set
correctly in platform configs found in qtbase.

Save the special environment that QNX needs to the env var QNX_TEST_ENV,
instead of the generic TESTARGS which might be overridden for other
purposes. QNX_TEST_ENV is now used by the script coin_qnx_qemu_runner.sh
defined in qtbase.

Change-Id: I86cd017c045f9c83f7c126828c8b6319df9b9d86
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
This commit is contained in:
Dimitrios Apostolou
2022-01-13 13:08:51 +01:00
parent d11f7803f4
commit fba918784f
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coin/platform_configs/cmake_platforms_qemu_qnx710.yaml
View File

@@ -11,9 +11,7 @@ Configurations:
Environment variables: [
'TARGET_CONFIGURE_ARGS=-DFEATURE_developer_build=ON -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",
'QNX_TEST_ENV=LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci',
'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'