From f1a0af4b7ed80f3762cfa3d74b9abf62c6564761 Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@digia.com>
Date: Fri, 15 Mar 2013 13:33:13 +0100
Subject: [PATCH] Squish: Fix running tst_qtquick_creation3
...when running on build machine and VNC session has been started
by Jenkins. If so, the DISPLAY variable must be set automatically
and we should not override it.
Change-Id: Ic38267256c5ab8889d67fe6a4e7e46dba6515a67
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
---
tests/system/shared/hook_utils.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/system/shared/hook_utils.py b/tests/system/shared/hook_utils.py
index 4a179eeee3d..79f627153ae 100644
--- a/tests/system/shared/hook_utils.py
+++ b/tests/system/shared/hook_utils.py
@@ -111,7 +111,8 @@ def modifyRunSettingsForHookIntoQtQuickUI(kitCount, workingDir, projectName, por
if platform.system() == "Darwin":
__addVariableToRunEnvironment__("DYLD_FRAMEWORK_PATH", qtLibPath)
if not platform.system() in ('Microsoft', 'Windows'):
- __addVariableToRunEnvironment__("DISPLAY", ":0.0")
+ if not os.getenv("DISPLAY"):
+ __addVariableToRunEnvironment__("DISPLAY", ":0.0")
result = qmlViewer
switchViewTo(ViewConstants.EDIT)
return result
--
GitLab