feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Squish: Fix running tst_qtquick_creation3

Browse Source 
...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>
This commit is contained in:
Christian Stenger
2013-03-15 13:33:13 +01:00
parent d646bde5f4
commit f1a0af4b7e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/system/shared/hook_utils.py
View File

@@ -111,7 +111,8 @@ def modifyRunSettingsForHookIntoQtQuickUI(kitCount, workingDir, projectName, por
if platform.system() == "Darwin": if platform.system() == "Darwin":
__addVariableToRunEnvironment__("DYLD_FRAMEWORK_PATH", qtLibPath) __addVariableToRunEnvironment__("DYLD_FRAMEWORK_PATH", qtLibPath)
if not platform.system() in ('Microsoft', 'Windows'): if not platform.system() in ('Microsoft', 'Windows'):
__addVariableToRunEnvironment__("DISPLAY", ":0.0") if not os.getenv("DISPLAY"):
__addVariableToRunEnvironment__("DISPLAY", ":0.0")
result = qmlViewer result = qmlViewer
switchViewTo(ViewConstants.EDIT) switchViewTo(ViewConstants.EDIT)
return result return result