From 26796f6024dd35c5262cd8a417edfd12541514f5 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 20 Jan 2012 09:24:26 +0100 Subject: [PATCH] Squish: Try to make this run on Jenkins 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 --- tests/system/shared/hook_utils.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/system/shared/hook_utils.py b/tests/system/shared/hook_utils.py index a60cda04027..92c018f26c6 100644 --- a/tests/system/shared/hook_utils.py +++ b/tests/system/shared/hook_utils.py @@ -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'):