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

Squish: Try to make this run on Jenkins

Browse Source 
I'm not sure for this - but LD_LIBRARY_PATH is always empty for
me. But inside Jenkins it's set and could mess up the hook into
sub application.

Change-Id: I2f3283f67d60a94083a5eb589abed01b05e66b29
Reviewed-by: Bill King <bill.king@nokia.com>
This commit is contained in:
Christian Stenger
2012-01-20 09:24:26 +01:00
parent c828c363b1
commit 26796f6024
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,6 +105,8 @@ def modifyRunSettingsForHookIntoQtQuickUI(projectName, port):
for varName in ("PATH", "SQUISH_LIBQTDIR"):
__addVariableToRunEnvironment__(varName, qtLibPath, row)
row = row + 1
if not platform.system() in ('Microsoft', 'Windows', 'Darwin'):
__addVariableToRunEnvironment__("LD_LIBRARY_PATH", qtLibPath, 0)
if platform.system() == "Darwin":
__addVariableToRunEnvironment__("DYLD_FRAMEWORK_PATH", qtLibPath, 0)
if not platform.system() in ('Microsoft', 'Windows'):