Commit 9f3eaaf5 authored by Robert Loehning's avatar Robert Loehning

Squish: Use shadow builds in tst_simple_analyze

So MSVC2010 and MSVC2013 don't get in their way.

Change-Id: Ie4696ce1afa695a6db109945ab506ce195322656
Reviewed-by: Christian Stenger's avatarChristian Stenger <christian.stenger@qt.io>
parent dd3fa302
...@@ -65,7 +65,7 @@ def performTest(workingDir, projectName, targetCount, availableConfigs): ...@@ -65,7 +65,7 @@ def performTest(workingDir, projectName, targetCount, availableConfigs):
# switching from MSVC to MinGW build will fail on the clean step of 'Rebuild All' because # switching from MSVC to MinGW build will fail on the clean step of 'Rebuild All' because
# of differences between MSVC's and MinGW's Makefile (so clean before switching kits) # of differences between MSVC's and MinGW's Makefile (so clean before switching kits)
invokeMenuItem('Build', 'Clean Project "%s"' % projectName) invokeMenuItem('Build', 'Clean Project "%s"' % projectName)
qtVersion = verifyBuildConfig(targetCount, kit, config, True, enableQmlDebug=True)[0] qtVersion = verifyBuildConfig(targetCount, kit, config, True, True, True)[0]
test.log("Selected kit using Qt %s" % qtVersion) test.log("Selected kit using Qt %s" % qtVersion)
# explicitly build before start debugging for adding the executable as allowed program to WinFW # explicitly build before start debugging for adding the executable as allowed program to WinFW
invokeMenuItem("Build", "Rebuild All") invokeMenuItem("Build", "Rebuild All")
...@@ -73,7 +73,13 @@ def performTest(workingDir, projectName, targetCount, availableConfigs): ...@@ -73,7 +73,13 @@ def performTest(workingDir, projectName, targetCount, availableConfigs):
if not checkCompile(): if not checkCompile():
test.fatal("Compile had errors... Skipping current build config") test.fatal("Compile had errors... Skipping current build config")
continue continue
allowAppThroughWinFW(workingDir, projectName, False) if platform.system() in ('Microsoft' 'Windows'):
switchViewTo(ViewConstants.PROJECTS)
switchToBuildOrRunSettingsFor(targetCount, kit, ProjectSettings.BUILD)
buildDir = os.path.join(str(waitForObject(":Qt Creator_Utils::BuildDirectoryLineEdit").text),
"debug")
switchViewTo(ViewConstants.EDIT)
allowAppThroughWinFW(buildDir, projectName, None)
switchViewTo(ViewConstants.DEBUG) switchViewTo(ViewConstants.DEBUG)
selectFromCombo(":Analyzer Toolbar.AnalyzerManagerToolBox_QComboBox", "QML Profiler") selectFromCombo(":Analyzer Toolbar.AnalyzerManagerToolBox_QComboBox", "QML Profiler")
recordButton = waitForObject("{container=':DebugModeWidget.Toolbar_QDockWidget' " recordButton = waitForObject("{container=':DebugModeWidget.Toolbar_QDockWidget' "
...@@ -123,7 +129,8 @@ def performTest(workingDir, projectName, targetCount, availableConfigs): ...@@ -123,7 +129,8 @@ def performTest(workingDir, projectName, targetCount, availableConfigs):
elif str(model.index(row, colCalls).data()) == "2": elif str(model.index(row, colCalls).data()) == "2":
test.compare(model.index(row, colMedian).data(), model.index(row, colLongest).data(), test.compare(model.index(row, colMedian).data(), model.index(row, colLongest).data(),
"For two calls, median and longest time must be the same.") "For two calls, median and longest time must be the same.")
deleteAppFromWinFW(workingDir, projectName, False) if platform.system() in ('Microsoft' 'Windows'):
deleteAppFromWinFW(buildDir, projectName, None)
progressBarWait(15000, False) # wait for "Build" progressbar to disappear progressBarWait(15000, False) # wait for "Build" progressbar to disappear
clickButton(waitForObject(":Analyzer Toolbar.Clear_QToolButton")) clickButton(waitForObject(":Analyzer Toolbar.Clear_QToolButton"))
test.verify(waitFor("model.rowCount() == 0", 3000), "Analyzer results cleared.") test.verify(waitFor("model.rowCount() == 0", 3000), "Analyzer results cleared.")
......
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