diff options
author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2018-02-06 10:03:01 +0100 |
---|---|---|
committer | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2018-02-07 04:45:09 +0000 |
commit | 532f1dea57210970cb8449fbb94f46e356706163 (patch) | |
tree | 016a4a98e95c69f558d8420fb77f1c949ab482f5 /coin | |
parent | f322d6047ac97f7c73760afef1a25ed1cb8968ab (diff) |
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 <sami.nurmenniemi@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Diffstat (limited to 'coin')
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh | 8 |
1 files changed, 7 insertions, 1 deletions
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}\"" |