From 207d3f9a3a4581dcf9e41f32900eff883c05e279 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 30 Jan 2014 10:40:59 +0100 Subject: [PATCH] Squish: Fix running hooked subprocess on Mac Change-Id: Ib7879aab6227758373023d0164edfc6f10f0e23c Reviewed-by: Robert Loehning --- tests/system/shared/build_utils.py | 1 + tests/system/shared/hook_utils.py | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/tests/system/shared/build_utils.py b/tests/system/shared/build_utils.py index 3d5345c2232..d5710f970d3 100644 --- a/tests/system/shared/build_utils.py +++ b/tests/system/shared/build_utils.py @@ -77,6 +77,7 @@ def compileSucceeded(compileOutput): "(\d:)?\d{2}:\d\d\.$", str(compileOutput), re.S) def waitForCompile(timeout=60000): + progressBarWait(10000) # avoids switching to Issues pane after checking Compile Output ensureChecked(":Qt Creator_CompileOutput_Core::Internal::OutputPaneToggleButton") output = waitForObject(":Qt Creator.Compile Output_Core::OutputWindow") if not waitFor("re.match('.*Elapsed time: (\d:)?\d{2}:\d\d\.$', str(output.plainText), re.S)", timeout): diff --git a/tests/system/shared/hook_utils.py b/tests/system/shared/hook_utils.py index c89dc1e761c..13800c9a85f 100644 --- a/tests/system/shared/hook_utils.py +++ b/tests/system/shared/hook_utils.py @@ -68,6 +68,11 @@ def modifyRunSettingsForHookInto(projectName, kitCount, port): changingVars.append("SQUISH_LIBQTDIR=%s" % replacement) else: changingVars.append(varName) + elif varName == "DYLD_FRAMEWORK_PATH" and platform.system() == 'Darwin': + value = str(model.data(model.index(index.row, 1)).toString()) + test.log("Adding %s to DYLD_FRAMEWORK_PATH" % qtLibPath) + replacement = ":".join(filter(len, [qtLibPath, value])) + changingVars.append("%s=%s" % (varName, replacement)) batchEditRunEnvironment(kitCount, 0, changingVars, True) switchViewTo(ViewConstants.EDIT) return result