From ee9e7bac7082a1dacdde096da1114372ab98706d Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Tue, 19 Mar 2019 16:33:45 +0100
Subject: [PATCH] Fix running proxypac test on qemu
Do not override '--no-sandbox' on boot2qt. Starting resolver service
on qemu is bonkers and ends up in unsupported calls during threading
checks. Adding '--no-zygote' solves the issue, however introduces
race condition and deadlocks on resolver service start, which would
make test flaky. The deadlock issue is not reproducible without qemu.
Therefore to workaround the issue run test in single process mode.
Task-number: QTBUG-63346
Change-Id: I33a1079776edecddf3d7653db6c2ecc3a868b1a1
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
tests/auto/widgets/proxypac/proxypac.pro | 3 ++-
tests/auto/widgets/widgets.pro | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/tests/auto/widgets/proxypac/proxypac.pro b/tests/auto/widgets/proxypac/proxypac.pro
index 1c2958d3a..4dbcd9365 100644
--- a/tests/auto/widgets/proxypac/proxypac.pro
+++ b/tests/auto/widgets/proxypac/proxypac.pro
@@ -4,7 +4,8 @@ HEADERS += proxyserver.h
SOURCES += proxyserver.cpp
proxy_pac.name = QTWEBENGINE_CHROMIUM_FLAGS
-proxy_pac.value = --proxy-pac-url="file://$$PWD/proxy.pac"
+boot2qt:proxy_pac.value = "--single-process --no-sandbox --proxy-pac-url=file://$$PWD/proxy.pac"
+else: proxy_pac.value = --proxy-pac-url="file://$$PWD/proxy.pac"
QT_TOOL_ENV += proxy_pac
diff --git a/tests/auto/widgets/widgets.pro b/tests/auto/widgets/widgets.pro
index c99640b4b..9dba2c070 100644
--- a/tests/auto/widgets/widgets.pro
+++ b/tests/auto/widgets/widgets.pro
@@ -44,6 +44,6 @@ boot2qt: SUBDIRS -= accessibility defaultsurfaceformat devtools \
qwebengineprofile \
qwebengineview \
qwebenginescript \
- proxypac offscreen
+ offscreen
win32: SUBDIRS -= offscreen
--
GitLab