diff options
| author | Christian Stenger <christian.stenger@digia.com> | 2014-01-30 10:40:59 +0100 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@digia.com> | 2014-01-31 09:02:47 +0100 |
| commit | 207d3f9a3a4581dcf9e41f32900eff883c05e279 (patch) | |
| tree | f60af73a8122ef6918adc2ef403bc2e6a598700c | |
| parent | 076f6e690f910628604c146ab68f33af823ec180 (diff) | |
| download | qt-creator-207d3f9a3a4581dcf9e41f32900eff883c05e279.tar.gz | |
Squish: Fix running hooked subprocess on Mac
Change-Id: Ib7879aab6227758373023d0164edfc6f10f0e23c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
| -rw-r--r-- | tests/system/shared/build_utils.py | 1 | ||||
| -rw-r--r-- | tests/system/shared/hook_utils.py | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/tests/system/shared/build_utils.py b/tests/system/shared/build_utils.py index 3d5345c223..d5710f970d 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 c89dc1e761..13800c9a85 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 |