diff --git a/tests/system/README b/tests/system/README index 4dc7da560c0..c7c48975fb9 100644 --- a/tests/system/README +++ b/tests/system/README @@ -20,11 +20,10 @@ You can also just provide them inside a different folder and specify the folder This folder must contain the following: * a QtCreator repository (or source copy) of tag v2.5.0 named 'creator' * a subfolder called 'creator-test-data' - * a speedcrunch repository (or source copy) inside 'creator-test-data' named 'speedcrunch' + * a speedcrunch 0.11 repository (or source copy) inside 'creator-test-data' named 'speedcrunch' * additional Squish versions for hooking into subprocesses inside different folders inside 'creator-test-data' following the information below Fifth - you'll have to make sure that some needed tools are available (no matter on which OS you're on). - * qmake * cmake * wget or curl, capable of HTTPS Normally it should be okay to just install them as usual and add their executables' path(s) to the PATH variable. diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index 835cc2ddbfb..9bab471de67 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -63,18 +63,12 @@ def openCmakeProject(projectPath, buildDir): def __handleCmakeWizardPage__(): generatorCombo = waitForObject(":Generator:_QComboBox") - mkspec = __getMkspecFromQmake__("qmake") - test.log("Using mkspec '%s'" % mkspec) - - generatorText = "Unix Generator (Desktop 474 GCC)" - if "win32-" in mkspec: - generatorName = {"win32-g++" : "MinGW Generator (Desktop 474 GCC)", - "win32-msvc2010" : "NMake Generator (Desktop 480 MSVC2010)"} - if mkspec in generatorName: - generatorText = generatorName[mkspec] + generatorText = "Unix Generator (Desktop 480 GCC)" + if platform.system() in ('Windows', 'Microsoft'): + generatorText = "MinGW Generator (Desktop 480 GCC)" index = generatorCombo.findText(generatorText) if index == -1: - test.warning("No matching CMake generator for mkspec '%s' found." % mkspec) + test.warning("No matching CMake generator for found.") else: generatorCombo.setCurrentIndex(index) diff --git a/tests/system/suite_general/tst_build_speedcrunch/test.py b/tests/system/suite_general/tst_build_speedcrunch/test.py index ec1baab897b..5ba5c4fdeee 100644 --- a/tests/system/suite_general/tst_build_speedcrunch/test.py +++ b/tests/system/suite_general/tst_build_speedcrunch/test.py @@ -46,7 +46,7 @@ def main(): startApplication("qtcreator" + SettingsPath) if not startedWithoutPluginError(): return - suitableKits = Targets.DESKTOP_474_GCC | Targets.DESKTOP_480_GCC + suitableKits = Targets.DESKTOP_480_GCC if platform.system() in ('Windows', 'Microsoft'): suitableKits |= Targets.DESKTOP_480_MSVC2010 checkedTargets = openQmakeProject(SpeedCrunchPath, suitableKits) diff --git a/tests/system/suite_general/tst_cmake_speedcrunch/test.py b/tests/system/suite_general/tst_cmake_speedcrunch/test.py index 6fd6fc94fb5..edc7495ce5e 100644 --- a/tests/system/suite_general/tst_cmake_speedcrunch/test.py +++ b/tests/system/suite_general/tst_cmake_speedcrunch/test.py @@ -36,9 +36,6 @@ def main(): if (which("cmake") == None): test.fatal("cmake not found in PATH - needed to run this test") return - if (which("qmake") == None): - test.fatal("qmake not found in PATH - needed to run this test") - return if not neededFilePresent(SpeedCrunchPath): return diff --git a/tests/system/suite_general/tst_openqt_creator/testdata/projecttree_speedcrunch.tsv b/tests/system/suite_general/tst_openqt_creator/testdata/projecttree_speedcrunch.tsv index 0939390a785..67580c04fdb 100644 --- a/tests/system/suite_general/tst_openqt_creator/testdata/projecttree_speedcrunch.tsv +++ b/tests/system/suite_general/tst_openqt_creator/testdata/projecttree_speedcrunch.tsv @@ -2,6 +2,7 @@ "speedcrunch.pro" "0" "Headers" "0" "core" "1" +"book.h" "2" "constants.h" "2" "evaluator.h" "2" "functions.h" "2" @@ -12,25 +13,23 @@ "bookdock.h" "2" "constantsdock.h" "2" "constantswidget.h" "2" -"deletevardlg.h" "2" "editor.h" "2" -"functionsdialog.h" "2" "functionsdock.h" "2" "functionswidget.h" "2" "historydock.h" "2" "historywidget.h" "2" -"insertvardlg.h" "2" -"keypad.h" "2" "mainwindow.h" "2" "resultdisplay.h" "2" "tipwidget.h" "2" +"variablelistwidget.h" "2" "variablesdock.h" "2" -"variableswidget.h" "2" "Sources" "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" @@ -39,24 +38,17 @@ "bookdock.cpp" "2" "constantsdock.cpp" "2" "constantswidget.cpp" "2" -"deletevardlg.cpp" "2" "editor.cpp" "2" -"functionsdialog.cpp" "2" "functionsdock.cpp" "2" "functionswidget.cpp" "2" "historydock.cpp" "2" "historywidget.cpp" "2" -"insertvardlg.cpp" "2" -"keypad.cpp" "2" "mainwindow.cpp" "2" "resultdisplay.cpp" "2" "syntaxhighlighter.cpp" "2" -"textedit.cpp" "2" "tipwidget.cpp" "2" +"variablelistwidget.cpp" "2" "variablesdock.cpp" "2" -"variableswidget.cpp" "2" -"main" "1" -"main.cpp" "2" "math" "1" "floatcommon.c" "2" "floatconst.c" "2" @@ -76,8 +68,45 @@ "floattrig.c" "2" "hmath.cpp" "2" "number.c" "2" -"thirdparty/binreloc" "1" +"thirdparty" "1" "binreloc.c" "2" +"main.cpp" "1" "Resources" "0" "resources" "1" "speedcrunch.qrc" "2" +"/" "3" +"locale/ar_JO.qm" "4" +"locale/ca_ES.qm" "4" +"locale/cs_CZ.qm" "4" +"locale/de_DE.qm" "4" +"locale/en_GB.qm" "4" +"locale/en_US.qm" "4" +"locale/es_AR.qm" "4" +"locale/es_ES.qm" "4" +"locale/et_EE.qm" "4" +"locale/eu_ES.qm" "4" +"locale/fi_FI.qm" "4" +"locale/fr_FR.qm" "4" +"locale/he_IL.qm" "4" +"locale/hu_HU.qm" "4" +"locale/id_ID.qm" "4" +"locale/it_IT.qm" "4" +"locale/ja_JP.qm" "4" +"locale/ko_KR.qm" "4" +"locale/lv_LV.qm" "4" +"locale/nb_NO.qm" "4" +"locale/nl_NL.qm" "4" +"locale/pl_PL.qm" "4" +"locale/pt_BR.qm" "4" +"locale/pt_PT.qm" "4" +"locale/ro_RO.qm" "4" +"locale/ru_RU.qm" "4" +"locale/sv_SE.qm" "4" +"locale/tr_TR.qm" "4" +"locale/uz_UZ.qm" "4" +"locale/vi_VN.qm" "4" +"locale/zh_CN.qm" "4" +"speedcrunch.png" "4" +"Other files" "0" +"resources" "1" +"speedcrunch.icns" "2"