Squish: Removed outdated cleanups

__removeTmpSettingsDir__() does it all.

Change-Id: Ic1eb2ef02665c5d863956a1587f4f46344743f8e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

3 files changed, 2 insertions, 31 deletions

diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py
index 341ad5bd45..1c2f7d5d6a 100644
--- a/tests/system/shared/project.py
+++ b/tests/system/shared/project.py
@@ -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
diff --git a/tests/system/suite_debugger/tst_build_new_project/test.py b/tests/system/suite_debugger/tst_build_new_project/test.py
index cd33ccfbbf..4474bbdc32 100644
--- a/tests/system/suite_debugger/tst_build_new_project/test.py
+++ b/tests/system/suite_debugger/tst_build_new_project/test.py
@@ -1,11 +1,10 @@
 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))
diff --git a/tests/system/suite_debugger/tst_cli_output_console/test.py b/tests/system/suite_debugger/tst_cli_output_console/test.py
index 692c01a5bd..02b4588f06 100644
--- a/tests/system/suite_debugger/tst_cli_output_console/test.py
+++ b/tests/system/suite_debugger/tst_cli_output_console/test.py
@@ -1,6 +1,5 @@
 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))