feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Squish: Fix tst_debug_empty_main for Mac

Browse Source 
Change-Id: I57cd9647d07cfbf823bdff63dd1c2f5c3050cb7c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
This commit is contained in:
Christian Stenger
2013-09-13 11:07:03 +02:00
parent e29ae8c537
commit 8b7dff6fdc
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/system/objects.map
View File

@@ -114,7 +114,7 @@
:Options_Core::Internal::SettingsDialog {type='Core::Internal::SettingsDialog' unnamed='1' visible='1' windowTitle~='(Options|Preferences)'} :Options_Core::Internal::SettingsDialog {type='Core::Internal::SettingsDialog' unnamed='1' visible='1' windowTitle~='(Options|Preferences)'}
:Options_QListView {type='QListView' unnamed='1' visible='1' window=':Options_Core::Internal::SettingsDialog'} :Options_QListView {type='QListView' unnamed='1' visible='1' window=':Options_Core::Internal::SettingsDialog'}
:QML Debugging.No_QPushButton {text='No' type='QPushButton' unnamed='1' visible='1' window=':QML Debugging_QMessageBox'} :QML Debugging.No_QPushButton {text='No' type='QPushButton' unnamed='1' visible='1' window=':QML Debugging_QMessageBox'}
:QML Debugging_QMessageBox {type='QMessageBox' unnamed='1' visible='1' windowTitle='QML Debugging'} :QML Debugging_QMessageBox {text='The option will only take effect if the project is recompiled. Do you want to recompile now?' type='QMessageBox' unnamed='1' visible='1'}
:QWebPage {type='QWebPage' unnamed='1'} :QWebPage {type='QWebPage' unnamed='1'}
:Qt Creator.Add Bookmark_QToolButton {text='Add Bookmark' type='QToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator.Add Bookmark_QToolButton {text='Add Bookmark' type='QToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:Qt Creator.Analyzer Toolbar_QDockWidget {name='Analyzer Toolbar' type='QDockWidget' visible='1' window=':Qt Creator_Core::Internal::MainWindow' windowTitle='Analyzer Toolbar'} :Qt Creator.Analyzer Toolbar_QDockWidget {name='Analyzer Toolbar' type='QDockWidget' visible='1' window=':Qt Creator_Core::Internal::MainWindow' windowTitle='Analyzer Toolbar'}

7
tests/system/suite_debugger/tst_debug_empty_main/test.py
View File

@@ -91,6 +91,8 @@ def __handleAppOutputWaitForDebuggerFinish__():
"Verifying whether debugging has finished.") "Verifying whether debugging has finished.")
def performDebugging(workingDir, projectName, checkedTargets): def performDebugging(workingDir, projectName, checkedTargets):
# for checking if it's a plain C application (as project names are set to match project type)
sampleC = re.compile("SampleC\d{3}")
for kit, config in iterateBuildConfigs(len(checkedTargets), "Debug"): for kit, config in iterateBuildConfigs(len(checkedTargets), "Debug"):
test.log("Selecting '%s' as build config" % config) test.log("Selecting '%s' as build config" % config)
selectBuildConfig(len(checkedTargets), kit, config) selectBuildConfig(len(checkedTargets), kit, config)
@@ -111,7 +113,10 @@ def performDebugging(workingDir, projectName, checkedTargets):
invokeMenuItem("Debug", "Toggle Breakpoint") invokeMenuItem("Debug", "Toggle Breakpoint")
clickButton(waitForObject(":*Qt Creator.Start Debugging_Core::Internal::FancyToolButton")) clickButton(waitForObject(":*Qt Creator.Start Debugging_Core::Internal::FancyToolButton"))
handleDebuggerWarnings(config, isMsvc) handleDebuggerWarnings(config, isMsvc)
clickButton(waitForObject(":*Qt Creator.Continue_Core::Internal::FancyToolButton")) # on Mac the breakpoint won't get hit if it's a C++ based application and the breakpoint is
# set to an empty code line inside an empty main
if platform.system() != "Darwin" or sampleC.match(projectName):
clickButton(waitForObject(":*Qt Creator.Continue_Core::Internal::FancyToolButton"))
__handleAppOutputWaitForDebuggerFinish__() __handleAppOutputWaitForDebuggerFinish__()
removeOldBreakpoints() removeOldBreakpoints()
deleteAppFromWinFW(workingDir, projectName, False) deleteAppFromWinFW(workingDir, projectName, False)