Commit 6b1b47d8 authored by Robert Loehning's avatar Robert Loehning Committed by Robert Löhning
Browse files

Squish: Let CMake build in temporary directory



Change-Id: Ib2cc65378b74f662652434dd1a65d845ee3fb741
Reviewed-by: default avatarChristian Stenger <christian.stenger@nokia.com>
Reviewed-by: default avatarBill King <bill.king@nokia.com>
parent 7e444479
......@@ -16,9 +16,11 @@ def openQmakeProject(projectPath):
selectFromCombo(":scrollArea.Create Build Configurations:_QComboBox", "For Each Qt Version One Debug And One Release")
clickButton(waitForObject("{text~='(Finish|Done)' type='QPushButton'}"))
def openCmakeProject(projectPath):
def openCmakeProject(projectPath, buildDir):
invokeMenuItem("File", "Open File or Project...")
selectFromFileDialog(projectPath)
replaceEditorContent("{type='Utils::BaseValidatingLineEdit' unnamed='1' visible='1'"
"window=':CMake Wizard_CMakeProjectManager::Internal::CMakeOpenProjectWizard'}", buildDir)
clickButton(waitForObject(":CMake Wizard.Next_QPushButton", 20000))
generatorCombo = waitForObject(":Generator:_QComboBox")
index = generatorCombo.findText("MinGW Generator (MinGW from SDK)")
......
source("../../shared/qtcreator.py")
SpeedCrunchPath = ""
BuildPath = tempDir()
def main():
if (which("cmake") == None):
......@@ -14,7 +15,7 @@ def main():
startApplication("qtcreator" + SettingsPath)
result = openCmakeProject(SpeedCrunchPath)
result = openCmakeProject(SpeedCrunchPath, BuildPath)
if not result:
test.warning("Could not open/create cmake project - leaving test")
invokeMenuItem("File", "Exit")
......@@ -45,15 +46,7 @@ def init():
cleanup()
def cleanup():
global BuildPath
# Make sure the .user files are gone
cleanUpUserFiles(SpeedCrunchPath)
BuildPath = srcPath + "/creator-test-data/speedcrunch/src/qtcreator-build"
if os.access(BuildPath, os.F_OK):
shutil.rmtree(BuildPath)
# added because creator uses this one for me
BuildPath = srcPath + "/creator-test-data/speedcrunch/qtcreator-build"
if os.access(BuildPath, os.F_OK):
shutil.rmtree(BuildPath)
deleteDirIfExists(BuildPath)
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