diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-01-09 13:07:57 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-01-09 13:13:00 +0100 |
| commit | cff2cc90e21c7ef4d363d459be9ad6cf17b9b494 (patch) | |
| tree | fc37439466f7ccf6a8bbfc4bb64e1ab21bfa4c21 /tests | |
| parent | b1239d6c4c77814c62598469bc1588b43c690acc (diff) | |
| parent | 32786ea9cadb4329b09dae2f825e61dcbd9fcc75 (diff) | |
Merge remote-tracking branch 'origin/4.5'
Conflicts:
src/plugins/cpptools/clangcompileroptionsbuilder.cpp
src/plugins/cpptools/clangcompileroptionsbuilder.h
src/plugins/cpptools/compileroptionsbuilder.cpp
src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
src/plugins/qmlprofiler/qmlprofilerclientmanager.h
src/plugins/qmlprofiler/qmlprofilertraceclient.cpp
src/plugins/qmlprofiler/qmlprofilertraceclient.h
src/shared/qbs
Change-Id: I364ababc5d41046d17e999096c4a7187c4e4e010
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/system/suite_general/tst_cmake_speedcrunch/test.py | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/tests/system/suite_general/tst_cmake_speedcrunch/test.py b/tests/system/suite_general/tst_cmake_speedcrunch/test.py index 6801d7c783..fdfbd1f065 100644 --- a/tests/system/suite_general/tst_cmake_speedcrunch/test.py +++ b/tests/system/suite_general/tst_cmake_speedcrunch/test.py @@ -68,16 +68,13 @@ def main(): treeFile = "projecttree_speedcrunch.tsv" compareProjectTree(naviTreeView % "speedcrunch( \[\S+\])?", treeFile) - if not cmakeSupportsServerMode() and JIRA.isBugStillOpen(18290): - test.xfail("Building with cmake in Tealeafreader mode may fail", "QTCREATORBUG-18290") - else: - # Invoke a rebuild of the application - invokeMenuItem("Build", "Rebuild All") + # Invoke a rebuild of the application + invokeMenuItem("Build", "Rebuild All") - # Wait for, and test if the build succeeded - waitForCompile(300000) - checkCompile() - checkLastBuild() + # Wait for, and test if the build succeeded + waitForCompile(300000) + checkCompile() + checkLastBuild() invokeMenuItem("File", "Exit") |