summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Stenger <christian.stenger@digia.com>2014-01-20 10:37:12 +0100
committerChristian Stenger <christian.stenger@digia.com>2014-01-20 13:38:58 +0100
commitd8cc72d7bdafe4048e8f930b885f8f790e91cef6 (patch)
tree6b65e4d397fd0ce59497e36bb6c4f4825ad0d2e6
parent0f04c2b3b0aff319733c4123d2b4511ed7743f74 (diff)
downloadqt-creator-d8cc72d7bdafe4048e8f930b885f8f790e91cef6.tar.gz
Squish: Let tst_debug_empty_main continue on error
Change-Id: Ic0772f96c3d99af1d2001ca599820bc61192281c Reviewed-by: Robert Loehning <robert.loehning@digia.com>
-rw-r--r--tests/system/suite_debugger/tst_debug_empty_main/test.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/system/suite_debugger/tst_debug_empty_main/test.py b/tests/system/suite_debugger/tst_debug_empty_main/test.py
index 7e7e13713a..ab5eceea28 100644
--- a/tests/system/suite_debugger/tst_debug_empty_main/test.py
+++ b/tests/system/suite_debugger/tst_debug_empty_main/test.py
@@ -88,8 +88,11 @@ def __handleAppOutputWaitForDebuggerFinish__():
ensureChecked(":Qt Creator_AppOutput_Core::Internal::OutputPaneToggleButton")
appOutput = waitForObject("{type='Core::OutputWindow' visible='1' "
"windowTitle='Application Output Window'}")
- test.verify(waitFor("str(appOutput.plainText).endswith('Debugging has finished')", 20000),
- "Verifying whether debugging has finished.")
+ if not test.verify(waitFor("str(appOutput.plainText).endswith('Debugging has finished')", 20000),
+ "Verifying whether debugging has finished."):
+ test.log("Aborting debugging to let test continue.")
+ invokeMenuItem("Debug", "Abort Debugging")
+ waitFor("str(appOutput.plainText).endswith('Debugging has finished')", 5000)
def performDebugging(workingDir, projectName, checkedTargets):
# for checking if it's a plain C application (as project names are set to match project type)