From fba918784f966db73c8e4d2b665ac6666f6f3229 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Thu, 13 Jan 2022 13:08:51 +0100 Subject: [PATCH] Cleanup of QNX Coin platform config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- coin/platform_configs/cmake_platforms_qemu_qnx710.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml index cc67fbf2..9dd02139 100644 --- a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml +++ b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml @@ -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'