summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Loehning <robert.loehning@digia.com>2013-01-23 13:56:16 +0100
committerRobert Loehning <robert.loehning@digia.com>2013-01-24 16:40:20 +0100
commit28d731c71771590f768dcb2f5be4506e4ed80833 (patch)
tree22c438abdb485b8643e71975a9e92c9e927572e9
parent34edc737c70d5567e22f54f222dcb6d7f027d139 (diff)
downloadqt-creator-28d731c71771590f768dcb2f5be4506e4ed80833.tar.gz
Squish: Exit test cases if runAndCloseApp() failed
Change-Id: I9149673fc1c227543b6d92ece0ed00a993e06ccf Reviewed-by: Christian Stenger <christian.stenger@digia.com>
-rwxr-xr-xtests/system/suite_APTW/shared/aptw.py3
-rw-r--r--tests/system/suite_debugger/tst_build_new_project/test.py3
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/system/suite_APTW/shared/aptw.py b/tests/system/suite_APTW/shared/aptw.py
index 24fe16ec6e..447401fe42 100755
--- a/tests/system/suite_APTW/shared/aptw.py
+++ b/tests/system/suite_APTW/shared/aptw.py
@@ -24,6 +24,7 @@ def runVerify(checkedTargets):
for kit, config in availableConfigs:
selectBuildConfig(len(checkedTargets), kit, config)
test.log("Using build config '%s'" % config)
- runAndCloseApp()
+ if not runAndCloseApp():
+ return
verifyBuildAndRun()
mouseClick(waitForObject(":*Qt Creator.Clear_QToolButton"))
diff --git a/tests/system/suite_debugger/tst_build_new_project/test.py b/tests/system/suite_debugger/tst_build_new_project/test.py
index 27e532859a..3cc454d140 100644
--- a/tests/system/suite_debugger/tst_build_new_project/test.py
+++ b/tests/system/suite_debugger/tst_build_new_project/test.py
@@ -11,5 +11,6 @@ def main():
for kit, config in availableConfigs:
selectBuildConfig(len(checkedTargets), kit, config)
test.log("Testing build configuration: " + config)
- runAndCloseApp()
+ if not runAndCloseApp():
+ return
invokeMenuItem("File", "Exit")