summaryrefslogtreecommitdiff
path: root/tests/system/shared/build_utils.py
diff options
context:
space:
mode:
authorRobert Loehning <robert.loehning@digia.com>2013-09-19 17:10:49 +0200
committerRobert Loehning <robert.loehning@digia.com>2013-09-20 13:47:55 +0200
commitee1bac2ee66dec914a8e414495792d4fe8d419c3 (patch)
treef566eab72ff9537602a24848c2521c6a7a84f68b /tests/system/shared/build_utils.py
parent5bf5eb17f1370a6324a0ee18a74e3289f22f464b (diff)
downloadqt-creator-ee1bac2ee66dec914a8e414495792d4fe8d419c3.tar.gz
Squish: Fix verifyBuildAndRun()
"The program has unexpectedly finished." is considered valid output, see https://bugreports.qt-project.org/browse/QTCREATORBUG-9212 Change-Id: Ia18e2dcfccdf1bdfbbc793a01897a88c4a17eb40 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Diffstat (limited to 'tests/system/shared/build_utils.py')
-rw-r--r--tests/system/shared/build_utils.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/system/shared/build_utils.py b/tests/system/shared/build_utils.py
index caae5b8c70..6048482eaf 100644
--- a/tests/system/shared/build_utils.py
+++ b/tests/system/shared/build_utils.py
@@ -241,7 +241,8 @@ def verifyBuildAndRun():
# check application output log
appOutput = logApplicationOutput()
if appOutput:
- test.verify(re.search(".* exited with code \d+", str(appOutput)) and
+ test.verify((re.search(".* exited with code \d+", str(appOutput)) or
+ re.search("The program has unexpectedly finished\.", str(appOutput))) and
re.search('[Ss]tarting.*', str(appOutput)),
"Verifying if built app started and closed successfully.")