From 6282a3fd8a9fbd03da5fe28ce8f3a3e5cf11f1e8 Mon Sep 17 00:00:00 2001 From: Tuomas Vaarala Date: Tue, 28 Apr 2026 12:38:02 +0300 Subject: [PATCH] Coin: QNX QEMU: set HOME and FONTCONFIG_FILE for tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When HOME was unset, ~/.cache collapsed to /.cache on the read-only QNX QEMU rootfs, so Fontconfig printed "No writable cache directories" from QtGui-linking sub-tests and broke the expected-output validation in tst_selftests. Set HOME=/data/home/root (distinct from TMPDIR so filesystem watcher tests keep separate watchable dirs) and point FONTCONFIG_FILE at the deployed fonts.conf. QNX SDP 8.0 ships fonts.conf at etc/fonts/fonts.conf, not etc/fontconfig/fonts.conf as 7.1 did, so correct the data_files.custom source path too. Squashes the former HOME-only and FONTCONFIG_FILE changes, which conflicted on the same QNX_TEST_ENV lines and could not integrate together. Pick-to: 6.8 6.11 6.12 Change-Id: I1943d07eff0a2e99bb96db28e73b4c77e4aa2df8 Reviewed-by: Marianne Yrjänä Reviewed-by: Simo Fält --- coin/platform_configs/cmake_platforms_qemu_qnx.yaml | 4 ++-- .../qnx_qemu_build_files/800/local/snippets/data_files.custom | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/platform_configs/cmake_platforms_qemu_qnx.yaml b/coin/platform_configs/cmake_platforms_qemu_qnx.yaml index c7da49e5..e29bfe41 100644 --- a/coin/platform_configs/cmake_platforms_qemu_qnx.yaml +++ b/coin/platform_configs/cmake_platforms_qemu_qnx.yaml @@ -13,7 +13,7 @@ Configurations: 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples', 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', 'QT_CMAKE_DIR=/opt/cmake-3.30.5/bin', - 'QNX_TEST_ENV=TMPDIR=/data/var/tmp LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci', + 'QNX_TEST_ENV=TMPDIR=/data/var/tmp HOME=/data/home/root FONTCONFIG_FILE=/data/var/etc/fontconfig/fonts.conf LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci', 'NON_QTBASE_TARGET_CMAKE_ARGS=-DCMAKE_SYSTEM_VERSION=710 -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', 'QNX_QEMU={{.Env.QNX_710_QEMU}}', 'VCPKG_HOST_TRIPLET=x64-linux-qt', @@ -64,7 +64,7 @@ Configurations: 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples', 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_800}}/qnx-toolchain-x8664.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', 'QT_CMAKE_DIR=/opt/cmake-3.30.5/bin', - 'QNX_TEST_ENV=TMPDIR=/data/var/tmp LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci', + 'QNX_TEST_ENV=TMPDIR=/data/var/tmp HOME=/data/home/root FONTCONFIG_FILE=/data/var/etc/fontconfig/fonts.conf LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci', 'NON_QTBASE_TARGET_CMAKE_ARGS=-DCMAKE_SYSTEM_VERSION=802 -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', 'QNX_QEMU={{.Env.QNX_800_QEMU}}', 'VCPKG_HOST_TRIPLET=x64-linux-qt', diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/data_files.custom b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/data_files.custom index cba74f1f..a3e14900 100644 --- a/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/data_files.custom +++ b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/data_files.custom @@ -13,7 +13,7 @@ PATH=__IFS_PATH__:/system/xbin:. var/share/zoneinfo=usr/share/zoneinfo [uid=0 gid=0 dperms=755 type=dir] var/share/fonts -var/etc/fontconfig/fonts.conf=etc/fontconfig/fonts.conf +var/etc/fontconfig/fonts.conf=etc/fonts/fonts.conf var/share/fonts=usr/share/fonts var/etc/hosts=local/misc_files/etc/hosts