Squish: Update tst_cmake_speedcrunch

Server mode has been dropped.

Change-Id: I356f814bb4b0084cfcecd3b92ede1a0c27daf2b4
Reviewed-by: Robert Loehning <robert.loehning@qt.io>

3 files changed, 183 insertions, 317 deletions

diff --git a/tests/system/suite_general/tst_cmake_speedcrunch/test.py b/tests/system/suite_general/tst_cmake_speedcrunch/test.py
index 29a7934a7f..e6f07b22c5 100644
--- a/tests/system/suite_general/tst_cmake_speedcrunch/test.py
+++ b/tests/system/suite_general/tst_cmake_speedcrunch/test.py
@@ -28,7 +28,7 @@ source("../../shared/qtcreator.py")
 SpeedCrunchPath = ""
 BuildPath = tempDir()
 
-def cmakeSupportsServerMode():
+def cmakeSupported():
     versionLines = filter(lambda line: "cmake version " in line,
                           getOutputFromCmdline(["cmake", "--version"]).splitlines())
     try:
@@ -38,17 +38,16 @@ def cmakeSupportsServerMode():
         minor = __builtin__.int(matcher.group(2))
     except:
         return False
-    if major < 3:
-        return False
-    elif major > 3:
-        return True
-    else:
-        return minor >= 7
+
+    return (major, minor) >= (3, 14)
 
 def main():
     if (which("cmake") == None):
         test.fatal("cmake not found in PATH - needed to run this test")
         return
+    if not cmakeSupported():
+        test.warning("CMake version is no more supported for QC")
+        return
     if not neededFilePresent(SpeedCrunchPath):
         return
 
@@ -62,10 +61,7 @@ def main():
         return
     waitForProjectParsing()
     naviTreeView = "{column='0' container=':Qt Creator_Utils::NavigationTreeView' text~='%s' type='QModelIndex'}"
-    if cmakeSupportsServerMode():
-        treeFile = "projecttree_speedcrunch_server.tsv"
-    else:
-        treeFile = "projecttree_speedcrunch.tsv"
+    treeFile = "projecttree_speedcrunch.tsv"
     compareProjectTree(naviTreeView % "speedcrunch( \[\S+\])?", treeFile)
 
     # Invoke a rebuild of the application
diff --git a/tests/system/suite_general/tst_cmake_speedcrunch/testdata/projecttree_speedcrunch.tsv b/tests/system/suite_general/tst_cmake_speedcrunch/testdata/projecttree_speedcrunch.tsv
index aa7ec8849e..8236d245f5 100644
--- a/tests/system/suite_general/tst_cmake_speedcrunch/testdata/projecttree_speedcrunch.tsv
+++ b/tests/system/suite_general/tst_cmake_speedcrunch/testdata/projecttree_speedcrunch.tsv
@@ -1,99 +1,178 @@
 "text"	"nestinglevel"
-"cmake_uninstall.cmake.in"	"0"
 "CMakeLists.txt"	"0"
-"SourceFiles.cmake"	"0"
-"core"	"0"
-"book.cpp"	"1"
-"book.h"	"1"
-"constants.cpp"	"1"
-"constants.h"	"1"
-"evaluator.cpp"	"1"
-"evaluator.h"	"1"
-"functions.cpp"	"1"
-"functions.h"	"1"
-"numberformatter.cpp"	"1"
-"numberformatter.h"	"1"
-"settings.cpp"	"1"
-"settings.h"	"1"
-"gui"	"0"
-"aboutbox.cpp"	"1"
-"aboutbox.h"	"1"
-"application.cpp"	"1"
-"application.h"	"1"
-"autohidelabel.cpp"	"1"
-"autohidelabel.h"	"1"
-"bookdock.cpp"	"1"
-"bookdock.h"	"1"
-"constantsdock.cpp"	"1"
-"constantsdock.h"	"1"
-"constantswidget.cpp"	"1"
-"constantswidget.h"	"1"
-"editor.cpp"	"1"
-"editor.h"	"1"
-"functionsdock.cpp"	"1"
-"functionsdock.h"	"1"
-"functionswidget.cpp"	"1"
-"functionswidget.h"	"1"
-"historydock.cpp"	"1"
-"historydock.h"	"1"
-"historywidget.cpp"	"1"
-"historywidget.h"	"1"
-"mainwindow.cpp"	"1"
-"mainwindow.h"	"1"
-"resultdisplay.cpp"	"1"
-"resultdisplay.h"	"1"
-"syntaxhighlighter.cpp"	"1"
-"syntaxhighlighter.h"	"1"
-"tipwidget.cpp"	"1"
-"tipwidget.h"	"1"
-"variablelistwidget.cpp"	"1"
-"variablelistwidget.h"	"1"
-"variablesdock.cpp"	"1"
-"variablesdock.h"	"1"
-"math"	"0"
-"floatcommon.c"	"1"
-"floatcommon.h"	"1"
-"floatconst.c"	"1"
-"floatconst.h"	"1"
-"floatconvert.c"	"1"
-"floatconvert.h"	"1"
-"floaterf.c"	"1"
-"floaterf.h"	"1"
-"floatexp.c"	"1"
-"floatexp.h"	"1"
-"floatgamma.c"	"1"
-"floatgamma.h"	"1"
-"floathmath.c"	"1"
-"floathmath.h"	"1"
-"floatio.c"	"1"
-"floatio.h"	"1"
-"floatipower.c"	"1"
-"floatipower.h"	"1"
-"floatlog.c"	"1"
-"floatlog.h"	"1"
-"floatlogic.c"	"1"
-"floatlogic.h"	"1"
-"floatlong.c"	"1"
-"floatlong.h"	"1"
-"floatnum.c"	"1"
-"floatnum.h"	"1"
-"floatpower.c"	"1"
-"floatpower.h"	"1"
-"floatseries.c"	"1"
-"floatseries.h"	"1"
-"floattrig.c"	"1"
-"floattrig.h"	"1"
-"hmath.cpp"	"1"
-"hmath.h"	"1"
-"number.c"	"1"
-"number.h"	"1"
-"resources"	"0"
-"speedcrunch.qrc"	"1"
-"tests"	"0"
-"testevaluator.cpp"	"1"
-"testfloatnum.c"	"1"
-"testhmath.cpp"	"1"
-"thirdparty"	"0"
-"binreloc.c"	"1"
-"binreloc.h"	"1"
-"main.cpp"	"0"
+"speedcrunch"	"0"
+"Source Files"	"1"
+"core"	"2"
+"book.cpp"	"3"
+"constants.cpp"	"3"
+"evaluator.cpp"	"3"
+"functions.cpp"	"3"
+"numberformatter.cpp"	"3"
+"settings.cpp"	"3"
+"gui"	"2"
+"aboutbox.cpp"	"3"
+"application.cpp"	"3"
+"autohidelabel.cpp"	"3"
+"bookdock.cpp"	"3"
+"constantsdock.cpp"	"3"
+"constantswidget.cpp"	"3"
+"editor.cpp"	"3"
+"functionsdock.cpp"	"3"
+"functionswidget.cpp"	"3"
+"historydock.cpp"	"3"
+"historywidget.cpp"	"3"
+"mainwindow.cpp"	"3"
+"resultdisplay.cpp"	"3"
+"syntaxhighlighter.cpp"	"3"
+"tipwidget.cpp"	"3"
+"variablelistwidget.cpp"	"3"
+"variablesdock.cpp"	"3"
+"math"	"2"
+"floatcommon.c"	"3"
+"floatconst.c"	"3"
+"floatconvert.c"	"3"
+"floaterf.c"	"3"
+"floatexp.c"	"3"
+"floatgamma.c"	"3"
+"floathmath.c"	"3"
+"floatio.c"	"3"
+"floatipower.c"	"3"
+"floatlog.c"	"3"
+"floatlogic.c"	"3"
+"floatlong.c"	"3"
+"floatnum.c"	"3"
+"floatpower.c"	"3"
+"floatseries.c"	"3"
+"floattrig.c"	"3"
+"hmath.cpp"	"3"
+"number.c"	"3"
+"resources"	"2"
+"speedcrunch.rc"	"3"
+"thirdparty"	"2"
+"binreloc.c"	"3"
+"main.cpp"	"2"
+"testevaluator"	"0"
+"Source Files"	"1"
+"core"	"2"
+"evaluator.cpp"	"3"
+"functions.cpp"	"3"
+"settings.cpp"	"3"
+"math"	"2"
+"floatcommon.c"	"3"
+"floatconst.c"	"3"
+"floatconvert.c"	"3"
+"floaterf.c"	"3"
+"floatexp.c"	"3"
+"floatgamma.c"	"3"
+"floathmath.c"	"3"
+"floatio.c"	"3"
+"floatipower.c"	"3"
+"floatlog.c"	"3"
+"floatlogic.c"	"3"
+"floatlong.c"	"3"
+"floatnum.c"	"3"
+"floatpower.c"	"3"
+"floatseries.c"	"3"
+"floattrig.c"	"3"
+"hmath.cpp"	"3"
+"number.c"	"3"
+"tests"	"2"
+"testevaluator.cpp"	"3"
+"testfloatnum"	"0"
+"Source Files"	"1"
+"math"	"2"
+"floatcommon.c"	"3"
+"floatconst.c"	"3"
+"floatconvert.c"	"3"
+"floaterf.c"	"3"
+"floatexp.c"	"3"
+"floatgamma.c"	"3"
+"floathmath.c"	"3"
+"floatio.c"	"3"
+"floatipower.c"	"3"
+"floatlog.c"	"3"
+"floatlogic.c"	"3"
+"floatlong.c"	"3"
+"floatnum.c"	"3"
+"floatpower.c"	"3"
+"floatseries.c"	"3"
+"floattrig.c"	"3"
+"number.c"	"3"
+"tests"	"2"
+"testfloatnum.c"	"3"
+"testhmath"	"0"
+"Source Files"	"1"
+"math"	"2"
+"floatcommon.c"	"3"
+"floatconst.c"	"3"
+"floatconvert.c"	"3"
+"floaterf.c"	"3"
+"floatexp.c"	"3"
+"floatgamma.c"	"3"
+"floathmath.c"	"3"
+"floatio.c"	"3"
+"floatipower.c"	"3"
+"floatlog.c"	"3"
+"floatlogic.c"	"3"
+"floatlong.c"	"3"
+"floatnum.c"	"3"
+"floatpower.c"	"3"
+"floatseries.c"	"3"
+"floattrig.c"	"3"
+"hmath.cpp"	"3"
+"number.c"	"3"
+"tests"	"2"
+"testhmath.cpp"	"3"
+"<Headers>"	"0"
+"core"	"1"
+"book.h"	"2"
+"constants.h"	"2"
+"errors.h"	"2"
+"evaluator.h"	"2"
+"functions.h"	"2"
+"numberformatter.h"	"2"
+"settings.h"	"2"
+"gui"	"1"
+"aboutbox.h"	"2"
+"application.h"	"2"
+"autohidelabel.h"	"2"
+"bookdock.h"	"2"
+"constantsdock.h"	"2"
+"constantswidget.h"	"2"
+"editor.h"	"2"
+"functionsdock.h"	"2"
+"functionswidget.h"	"2"
+"historydock.h"	"2"
+"historywidget.h"	"2"
+"mainwindow.h"	"2"
+"resultdisplay.h"	"2"
+"syntaxhighlighter.h"	"2"
+"tipwidget.h"	"2"
+"variablelistwidget.h"	"2"
+"variablesdock.h"	"2"
+"math"	"1"
+"floatcommon.h"	"2"
+"floatconfig.h"	"2"
+"floatconst.h"	"2"
+"floatconvert.h"	"2"
+"floaterf.h"	"2"
+"floatexp.h"	"2"
+"floatgamma.h"	"2"
+"floathmath.h"	"2"
+"floatincgamma.h"	"2"
+"floatio.h"	"2"
+"floatipower.h"	"2"
+"floatlog.h"	"2"
+"floatlogic.h"	"2"
+"floatlong.h"	"2"
+"floatnum.h"	"2"
+"floatpower.h"	"2"
+"floatseries.h"	"2"
+"floattrig.h"	"2"
+"hmath.h"	"2"
+"number.h"	"2"
+"thirdparty"	"1"
+"binreloc.h"	"2"
+"CMake Modules"	"0"
+"cmake_uninstall.cmake.in"	"1"
+"SourceFiles.cmake"	"1"
diff --git a/tests/system/suite_general/tst_cmake_speedcrunch/testdata/projecttree_speedcrunch_server.tsv b/tests/system/suite_general/tst_cmake_speedcrunch/testdata/projecttree_speedcrunch_server.tsv
deleted file mode 100644
index 54457c0256..0000000000
--- a/tests/system/suite_general/tst_cmake_speedcrunch/testdata/projecttree_speedcrunch_server.tsv
+++ /dev/null
@@ -1,209 +0,0 @@
-"text"	"nestinglevel"
-"CMakeLists.txt"	"0"
-"speedcrunch"	"0"
-"core"	"1"
-"book.cpp"	"2"
-"constants.cpp"	"2"
-"evaluator.cpp"	"2"
-"functions.cpp"	"2"
-"numberformatter.cpp"	"2"
-"settings.cpp"	"2"
-"gui"	"1"
-"aboutbox.cpp"	"2"
-"application.cpp"	"2"
-"autohidelabel.cpp"	"2"
-"bookdock.cpp"	"2"
-"constantsdock.cpp"	"2"
-"constantswidget.cpp"	"2"
-"editor.cpp"	"2"
-"functionsdock.cpp"	"2"
-"functionswidget.cpp"	"2"
-"historydock.cpp"	"2"
-"historywidget.cpp"	"2"
-"mainwindow.cpp"	"2"
-"resultdisplay.cpp"	"2"
-"syntaxhighlighter.cpp"	"2"
-"tipwidget.cpp"	"2"
-"variablelistwidget.cpp"	"2"
-"variablesdock.cpp"	"2"
-"math"	"1"
-"floatcommon.c"	"2"
-"floatconst.c"	"2"
-"floatconvert.c"	"2"
-"floaterf.c"	"2"
-"floatexp.c"	"2"
-"floatgamma.c"	"2"
-"floathmath.c"	"2"
-"floatio.c"	"2"
-"floatipower.c"	"2"
-"floatlog.c"	"2"
-"floatlogic.c"	"2"
-"floatlong.c"	"2"
-"floatnum.c"	"2"
-"floatpower.c"	"2"
-"floatseries.c"	"2"
-"floattrig.c"	"2"
-"hmath.cpp"	"2"
-"number.c"	"2"
-"resources"	"1"
-"speedcrunch.qrc"	"2"
-"/"	"3"
-"locale"	"4"
-"ar_JO.qm"	"5"
-"ca_ES.qm"	"5"
-"cs_CZ.qm"	"5"
-"de_DE.qm"	"5"
-"en_GB.qm"	"5"
-"en_US.qm"	"5"
-"es_AR.qm"	"5"
-"es_ES.qm"	"5"
-"et_EE.qm"	"5"
-"eu_ES.qm"	"5"
-"fi_FI.qm"	"5"
-"fr_FR.qm"	"5"
-"he_IL.qm"	"5"
-"hu_HU.qm"	"5"
-"id_ID.qm"	"5"
-"it_IT.qm"	"5"
-"ja_JP.qm"	"5"
-"ko_KR.qm"	"5"
-"lv_LV.qm"	"5"
-"nb_NO.qm"	"5"
-"nl_NL.qm"	"5"
-"pl_PL.qm"	"5"
-"pt_BR.qm"	"5"
-"pt_PT.qm"	"5"
-"ro_RO.qm"	"5"
-"ru_RU.qm"	"5"
-"sv_SE.qm"	"5"
-"tr_TR.qm"	"5"
-"uz_UZ.qm"	"5"
-"vi_VN.qm"	"5"
-"zh_CN.qm"	"5"
-"speedcrunch.png"	"4"
-"speedcrunch.rc"	"2"
-"thirdparty"	"1"
-"binreloc.c"	"2"
-"main.cpp"	"1"
-"testevaluator"	"0"
-"core"	"1"
-"evaluator.cpp"	"2"
-"functions.cpp"	"2"
-"settings.cpp"	"2"
-"math"	"1"
-"floatcommon.c"	"2"
-"floatconst.c"	"2"
-"floatconvert.c"	"2"
-"floaterf.c"	"2"
-"floatexp.c"	"2"
-"floatgamma.c"	"2"
-"floathmath.c"	"2"
-"floatio.c"	"2"
-"floatipower.c"	"2"
-"floatlog.c"	"2"
-"floatlogic.c"	"2"
-"floatlong.c"	"2"
-"floatnum.c"	"2"
-"floatpower.c"	"2"
-"floatseries.c"	"2"
-"floattrig.c"	"2"
-"hmath.cpp"	"2"
-"number.c"	"2"
-"tests"	"1"
-"testevaluator.cpp"	"2"
-"testfloatnum"	"0"
-"math"	"1"
-"floatcommon.c"	"2"
-"floatconst.c"	"2"
-"floatconvert.c"	"2"
-"floaterf.c"	"2"
-"floatexp.c"	"2"
-"floatgamma.c"	"2"
-"floathmath.c"	"2"
-"floatio.c"	"2"
-"floatipower.c"	"2"
-"floatlog.c"	"2"
-"floatlogic.c"	"2"
-"floatlong.c"	"2"
-"floatnum.c"	"2"
-"floatpower.c"	"2"
-"floatseries.c"	"2"
-"floattrig.c"	"2"
-"number.c"	"2"
-"tests"	"1"
-"testfloatnum.c"	"2"
-"testhmath"	"0"
-"math"	"1"
-"floatcommon.c"	"2"
-"floatconst.c"	"2"
-"floatconvert.c"	"2"
-"floaterf.c"	"2"
-"floatexp.c"	"2"
-"floatgamma.c"	"2"
-"floathmath.c"	"2"
-"floatio.c"	"2"
-"floatipower.c"	"2"
-"floatlog.c"	"2"
-"floatlogic.c"	"2"
-"floatlong.c"	"2"
-"floatnum.c"	"2"
-"floatpower.c"	"2"
-"floatseries.c"	"2"
-"floattrig.c"	"2"
-"hmath.cpp"	"2"
-"number.c"	"2"
-"tests"	"1"
-"testhmath.cpp"	"2"
-"<Headers>"	"0"
-"core"	"1"
-"book.h"	"2"
-"constants.h"	"2"
-"errors.h"	"2"
-"evaluator.h"	"2"
-"functions.h"	"2"
-"numberformatter.h"	"2"
-"settings.h"	"2"
-"gui"	"1"
-"aboutbox.h"	"2"
-"application.h"	"2"
-"autohidelabel.h"	"2"
-"bookdock.h"	"2"
-"constantsdock.h"	"2"
-"constantswidget.h"	"2"
-"editor.h"	"2"
-"functionsdock.h"	"2"
-"functionswidget.h"	"2"
-"historydock.h"	"2"
-"historywidget.h"	"2"
-"mainwindow.h"	"2"
-"resultdisplay.h"	"2"
-"syntaxhighlighter.h"	"2"
-"tipwidget.h"	"2"
-"variablelistwidget.h"	"2"
-"variablesdock.h"	"2"
-"math"	"1"
-"floatcommon.h"	"2"
-"floatconfig.h"	"2"
-"floatconst.h"	"2"
-"floatconvert.h"	"2"
-"floaterf.h"	"2"
-"floatexp.h"	"2"
-"floatgamma.h"	"2"
-"floathmath.h"	"2"
-"floatincgamma.h"	"2"
-"floatio.h"	"2"
-"floatipower.h"	"2"
-"floatlog.h"	"2"
-"floatlogic.h"	"2"
-"floatlong.h"	"2"
-"floatnum.h"	"2"
-"floatpower.h"	"2"
-"floatseries.h"	"2"
-"floattrig.h"	"2"
-"hmath.h"	"2"
-"number.h"	"2"
-"thirdparty"	"1"
-"binreloc.h"	"2"
-"CMake Modules"	"0"
-"cmake_uninstall.cmake.in"	"1"
-"SourceFiles.cmake"	"1"