Skip to content
Snippets Groups Projects
Commit f562f867 authored by Robert Löhning's avatar Robert Löhning
Browse files

Squish: Use shadow builds in tst_simple_debug


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

Change-Id: Ib32c30dc0cc960756bb423348d88452aa20fbfcd
Reviewed-by: default avatarChristian Stenger <christian.stenger@qt.io>
parent 8067297e
No related branches found
No related tags found
No related merge requests found
...@@ -164,6 +164,7 @@ ...@@ -164,6 +164,7 @@
:Qt Creator_SearchResult_Core::Internal::OutputPaneToggleButton {occurrence='2' type='Core::Internal::OutputPaneToggleButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_SearchResult_Core::Internal::OutputPaneToggleButton {occurrence='2' type='Core::Internal::OutputPaneToggleButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:Qt Creator_SystemSettings.Details_Utils::DetailsButton {occurrence='4' text='Details' type='Utils::DetailsButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_SystemSettings.Details_Utils::DetailsButton {occurrence='4' text='Details' type='Utils::DetailsButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:Qt Creator_TextEditor::TextEditorWidget {type='TextEditor::TextEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_TextEditor::TextEditorWidget {type='TextEditor::TextEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:Qt Creator_Utils::BuildDirectoryLineEdit {occurrence='2' type='Utils::FancyLineEdit' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:Qt Creator_Utils::NavigationTreeView {type='Utils::NavigationTreeView' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_Utils::NavigationTreeView {type='Utils::NavigationTreeView' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:Qt Creator_Utils::NavigationTreeView::QExpandingLineEdit {container=':Qt Creator_Utils::NavigationTreeView' type='QExpandingLineEdit' unnamed='1' visible='1'} :Qt Creator_Utils::NavigationTreeView::QExpandingLineEdit {container=':Qt Creator_Utils::NavigationTreeView' type='QExpandingLineEdit' unnamed='1' visible='1'}
:Qt Gui Application.Form file:_QLabel {name='formLabel' text='Form file:' type='QLabel' visible='1' window=':Qt Gui Application_QmakeProjectManager::Internal::GuiAppWizardDialog'} :Qt Gui Application.Form file:_QLabel {name='formLabel' text='Form file:' type='QLabel' visible='1' window=':Qt Gui Application_QmakeProjectManager::Internal::GuiAppWizardDialog'}
......
...@@ -58,14 +58,20 @@ def main(): ...@@ -58,14 +58,20 @@ def main():
test.fatal("Haven't found a suitable Qt version - leaving without debugging.") test.fatal("Haven't found a suitable Qt version - leaving without debugging.")
for kit, config in availableConfigs: for kit, config in availableConfigs:
test.log("Selecting '%s' as build config" % config) test.log("Selecting '%s' as build config" % config)
verifyBuildConfig(len(checkedTargets), kit, config, True, enableQmlDebug=True) verifyBuildConfig(len(checkedTargets), kit, config, True, True, True)
# 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")
waitForCompile(300000) waitForCompile(300000)
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(len(checkedTargets), kit, ProjectSettings.BUILD)
buildDir = os.path.join(str(waitForObject(":Qt Creator_Utils::BuildDirectoryLineEdit").text),
"debug")
switchViewTo(ViewConstants.EDIT)
allowAppThroughWinFW(buildDir, projectName, None)
if not doSimpleDebugging(len(checkedTargets), kit, config, if not doSimpleDebugging(len(checkedTargets), kit, config,
len(expectedBreakpointsOrder), expectedBreakpointsOrder): len(expectedBreakpointsOrder), expectedBreakpointsOrder):
try: try:
...@@ -74,7 +80,8 @@ def main(): ...@@ -74,7 +80,8 @@ def main():
clickButton(stopB) clickButton(stopB)
except: except:
pass pass
deleteAppFromWinFW(workingDir, projectName, False) if platform.system() in ('Microsoft' 'Windows'):
deleteAppFromWinFW(buildDir, projectName, None)
# close application output window of current run to avoid mixing older output on the next run # close application output window of current run to avoid mixing older output on the next run
ensureChecked(":Qt Creator_AppOutput_Core::Internal::OutputPaneToggleButton") ensureChecked(":Qt Creator_AppOutput_Core::Internal::OutputPaneToggleButton")
clickButton(waitForObject("{type='CloseButton' unnamed='1' visible='1' " clickButton(waitForObject("{type='CloseButton' unnamed='1' visible='1' "
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment