mirror of
git://code.qt.io/qt/qt5.git
synced 2026-06-22 19:49:17 +08:00
Coin: QNX QEMU: set HOME and FONTCONFIG_FILE for tests
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ä <marianne.yrjana@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io>
This commit is contained in:
@@ -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',
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user