Commit 9687e188 authored by Robert Loehning's avatar Robert Loehning

Squish: Removed outdated cleanups

__removeTmpSettingsDir__() does it all.

Change-Id: Ic1eb2ef02665c5d863956a1587f4f46344743f8e
Reviewed-by: default avatarChristian Stenger <christian.stenger@digia.com>
parent 10c40294
......@@ -68,17 +68,6 @@ def openCmakeProject(projectPath, buildDir):
return False
return True
def shadowBuildDir(path, project, qtVersion, debugVersion):
qtVersion = qtVersion.replace(" ", "_")
qtVersion = qtVersion.replace(".", "_")
qtVersion = qtVersion.replace("(", "_")
qtVersion = qtVersion.replace(")", "_")
buildDir = path + os.sep + project + "-build-desktop-" + qtVersion
if debugVersion:
return buildDir + "_Debug"
else:
return buildDir + "_Release"
# this function returns a list of available targets - this is not 100% error proof
# because the Simulator target is added for some cases even when Simulator has not
# been set up inside Qt versions/Toolchains
......
source("../../shared/qtcreator.py")
projectsPath = tempDir()
project = "SquishProject"
def main():
startApplication("qtcreator" + SettingsPath)
createProject_Qt_Console(projectsPath, project)
createProject_Qt_Console(tempDir(), project)
availableConfigs = iterateBuildConfigs(1, 0)
if not availableConfigs:
test.fatal("Haven't found a suitable Qt version - leaving without building.")
......@@ -14,11 +13,3 @@ def main():
test.log("Testing build configuration: " + config)
runAndCloseApp()
invokeMenuItem("File", "Exit")
waitForCleanShutdown()
def init():
cleanup()
def cleanup():
deleteDirIfExists(projectsPath + os.sep + project)
deleteDirIfExists(shadowBuildDir(projectsPath, project, defaultQtVersion, 1))
source("../../shared/qtcreator.py")
projectsPath = tempDir()
project = "untitled"
def __handlerunControlFinished__(object, runControlP):
......@@ -18,7 +17,7 @@ def main():
startApplication("qtcreator" + SettingsPath)
installLazySignalHandler("{type='ProjectExplorer::Internal::ProjectExplorerPlugin' unnamed='1'}",
"runControlFinished(ProjectExplorer::RunControl*)", "__handlerunControlFinished__")
createProject_Qt_Console(projectsPath, project)
createProject_Qt_Console(tempDir(), project)
mainEditor = waitForObject(":Qt Creator_CppEditor::Internal::CPPEditorWidget")
replaceEditorContent(mainEditor, "")
......@@ -88,11 +87,3 @@ def main():
clickButton(waitForObject(":Qt Creator_CloseButton"))
invokeMenuItem("File", "Exit")
waitForCleanShutdown()
def init():
cleanup()
def cleanup():
deleteDirIfExists(projectsPath + os.sep + project)
deleteDirIfExists(shadowBuildDir(projectsPath, project, defaultQtVersion, 1))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment