forked from qt-creator/qt-creator
Squish: Fix running hooked subprocess on Mac
Change-Id: Ib7879aab6227758373023d0164edfc6f10f0e23c Reviewed-by: Robert Loehning <robert.loehning@digia.com>
This commit is contained in:
@@ -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):
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user