From 532f1dea57210970cb8449fbb94f46e356706163 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Tue, 6 Feb 2018 10:03:01 +0100 Subject: Provisioning: Don't test window decorations on Ubuntu 16.04 QEMU Decorations were previously disabled within the Wayland tests to work around another issue. That issue has now been fixed, and decorations have been enabled again, but these tests now became flaky when run within QEMU. Task-number: QTBUG-66173 Change-Id: I23b722ebc0719a2fd359ba5c3c57c66a887c06de Reviewed-by: Sami Nurmenniemi Reviewed-by: Jani Heikkinen --- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64') diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh index 9ff1ec6c..b2057b21 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh @@ -94,4 +94,10 @@ sed $QEMU_FONTCONFFILE -e "s:/usr/share/fonts:$QEMU_FONTCONFPATH/fonts:" -i sed $QEMU_FONTCONFFILE -e "s:/usr/local/share/fonts:$QEMU_FONTCONFPATH/local_fonts:" -i # Set QEMU font configuration variables -SetEnvVar "QEMU_SET_ENV" "\"FONTCONFIG_FILE=$QEMU_FONTCONFFILE,FONTCONFIG_PATH=$QEMU_FONTCONFPATH\"" +qemu_env="FONTCONFIG_FILE=$QEMU_FONTCONFFILE" +qemu_env="${qemu_env},FONTCONFIG_PATH=$QEMU_FONTCONFPATH" + +# Disable QtWayland window decorations, as they cause flakiness when used inside qemu (QTBUG-66173) +qemu_env="${qemu_env},QT_WAYLAND_DISABLE_WINDOWDECORATION=1" + +SetEnvVar "QEMU_SET_ENV" "\"${qemu_env}\"" -- cgit v1.2.3