diff options
author | Robert Loehning <robert.loehning@qt.io> | 2018-04-27 14:00:39 +0200 |
---|---|---|
committer | Robert Loehning <robert.loehning@qt.io> | 2018-05-24 10:01:56 +0000 |
commit | e8586c8d1247abff6388396ce4de92adf7305814 (patch) | |
tree | f4561722f850ef0c7ca5f15cc5106feaf528f2a9 /tests | |
parent | f2a5932674749b248b42b04b166fa2f621fcbfec (diff) |
Squish: Configure Qt Creator projects on Qt 5.10
Task-number: QTCREATORBUG-20056
Change-Id: I0d12747ac9510fbab2cbe1e751d3613608a07053
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'tests')
3 files changed, 12 insertions, 137 deletions
diff --git a/tests/system/suite_general/tst_opencreator_qbs/test.py b/tests/system/suite_general/tst_opencreator_qbs/test.py index 9a11127df8..a20426d359 100644 --- a/tests/system/suite_general/tst_opencreator_qbs/test.py +++ b/tests/system/suite_general/tst_opencreator_qbs/test.py @@ -26,8 +26,6 @@ source("../../shared/qtcreator.py") def main(): - test.warning("This needs a Qt 5.6.2 kit. Skipping it.") - return pathCreator = os.path.join(srcPath, "creator", "qtcreator.qbs") if not neededFilePresent(pathCreator): return @@ -36,8 +34,8 @@ def main(): if not startedWithoutPluginError(): return openQbsProject(pathCreator) - if not addAndActivateKit(Targets.DESKTOP_5_6_1_DEFAULT): - test.fatal("Failed to activate '%s'" % Targets.getStringForTarget(Targets.DESKTOP_5_4_1_GCC)) + if not addAndActivateKit(Targets.DESKTOP_5_10_1_DEFAULT): + test.fatal("Failed to activate '%s'" % Targets.getStringForTarget(Targets.DESKTOP_5_10_1_DEFAULT)) invokeMenuItem("File", "Exit") return test.log("Start parsing project") diff --git a/tests/system/suite_general/tst_opencreator_qbs/testdata/projecttree_creator.tsv b/tests/system/suite_general/tst_opencreator_qbs/testdata/projecttree_creator.tsv index cfade2719b..59f46f7a87 100644 --- a/tests/system/suite_general/tst_opencreator_qbs/testdata/projecttree_creator.tsv +++ b/tests/system/suite_general/tst_opencreator_qbs/testdata/projecttree_creator.tsv @@ -11808,124 +11808,6 @@ "outputprocessor.h" "3" "clangbackend" "2" "clangbackend.qbs:3" "3" -"Group 3" "3" -"clangbackend.qbs:9" "4" -"ipcsource" "4" -"clangasyncjob.h" "5" -"clangbackend_global.h" "5" -"clangclock.h" "5" -"clangcodecompleteresults.cpp" "5" -"clangcodecompleteresults.h" "5" -"clangcodemodelserver.cpp" "5" -"clangcodemodelserver.h" "5" -"clangcompletecodejob.cpp" "5" -"clangcompletecodejob.h" "5" -"clangcreateinitialdocumentpreamblejob.cpp" "5" -"clangcreateinitialdocumentpreamblejob.h" "5" -"clangdocument.cpp" "5" -"clangdocument.h" "5" -"clangdocumentprocessor.cpp" "5" -"clangdocumentprocessor.h" "5" -"clangdocumentprocessors.cpp" "5" -"clangdocumentprocessors.h" "5" -"clangdocuments.cpp" "5" -"clangdocuments.h" "5" -"clangdocumentsuspenderresumer.cpp" "5" -"clangdocumentsuspenderresumer.h" "5" -"clangexceptions.cpp" "5" -"clangexceptions.h" "5" -"clangfilepath.cpp" "5" -"clangfilepath.h" "5" -"clangfilesystemwatcher.cpp" "5" -"clangfilesystemwatcher.h" "5" -"clangiasyncjob.cpp" "5" -"clangiasyncjob.h" "5" -"clangjobcontext.cpp" "5" -"clangjobcontext.h" "5" -"clangjobqueue.cpp" "5" -"clangjobqueue.h" "5" -"clangjobrequest.cpp" "5" -"clangjobrequest.h" "5" -"clangjobs.cpp" "5" -"clangjobs.h" "5" -"clangparsesupportivetranslationunitjob.cpp" "5" -"clangparsesupportivetranslationunitjob.h" "5" -"clangreferencescollector.cpp" "5" -"clangreferencescollector.h" "5" -"clangreparsesupportivetranslationunitjob.cpp" "5" -"clangreparsesupportivetranslationunitjob.h" "5" -"clangrequestdocumentannotationsjob.cpp" "5" -"clangrequestdocumentannotationsjob.h" "5" -"clangrequestreferencesjob.cpp" "5" -"clangrequestreferencesjob.h" "5" -"clangresumedocumentjob.cpp" "5" -"clangresumedocumentjob.h" "5" -"clangstring.h" "5" -"clangsupportivetranslationunitinitializer.cpp" "5" -"clangsupportivetranslationunitinitializer.h" "5" -"clangsuspenddocumentjob.cpp" "5" -"clangsuspenddocumentjob.h" "5" -"clangtranslationunit.cpp" "5" -"clangtranslationunit.h" "5" -"clangtranslationunits.cpp" "5" -"clangtranslationunits.h" "5" -"clangtranslationunitupdater.cpp" "5" -"clangtranslationunitupdater.h" "5" -"clangtype.cpp" "5" -"clangtype.h" "5" -"clangunsavedfilesshallowarguments.cpp" "5" -"clangunsavedfilesshallowarguments.h" "5" -"clangupdatedocumentannotationsjob.cpp" "5" -"clangupdatedocumentannotationsjob.h" "5" -"codecompleter.cpp" "5" -"codecompleter.h" "5" -"codecompletionchunkconverter.cpp" "5" -"codecompletionchunkconverter.h" "5" -"codecompletionsextractor.cpp" "5" -"codecompletionsextractor.h" "5" -"commandlinearguments.cpp" "5" -"commandlinearguments.h" "5" -"cursor.cpp" "5" -"cursor.h" "5" -"diagnostic.cpp" "5" -"diagnostic.h" "5" -"diagnosticset.cpp" "5" -"diagnosticset.h" "5" -"diagnosticsetiterator.h" "5" -"fixit.cpp" "5" -"fixit.h" "5" -"highlightingmark.cpp" "5" -"highlightingmark.h" "5" -"highlightingmarks.cpp" "5" -"highlightingmarks.h" "5" -"highlightingmarksiterator.h" "5" -"projectpart.cpp" "5" -"projectpart.h" "5" -"projects.cpp" "5" -"projects.h" "5" -"skippedsourceranges.cpp" "5" -"skippedsourceranges.h" "5" -"sourcelocation.cpp" "5" -"sourcelocation.h" "5" -"sourcerange.cpp" "5" -"sourcerange.h" "5" -"unsavedfile.cpp" "5" -"unsavedfile.h" "5" -"unsavedfiles.cpp" "5" -"unsavedfiles.h" "5" -"utf8positionfromlinecolumn.cpp" "5" -"utf8positionfromlinecolumn.h" "5" -"Group 4" "3" -"clangbackend.qbs:17" "4" -"crashhandlersetup.cpp" "5" -"crashhandlersetup.h" "5" -"standard pch file (gui)" "3" -"QtcProduct.qbs:58" "4" -"qtcreator_gui_pch.h" "5" -"standard pch file (non-gui)" "3" -"QtcProduct.qbs:50" "4" -"qtcreator_pch.h" "5" -"clangbackendmain.cpp" "3" "iostool" "2" "iostool.qbs:3" "3" "standard pch file (gui)" "3" @@ -12588,6 +12470,13 @@ "diff.qbs:3" "3" "Differ autotest" "3" "differ.qbs:3" "4" +"standard pch file (gui)" "4" +"QtcProduct.qbs:58" "5" +"qtcreator_gui_pch.h" "6" +"standard pch file (non-gui)" "4" +"QtcProduct.qbs:50" "5" +"qtcreator_pch.h" "6" +"tst_differ.cpp" "4" "Environment autotest" "2" "environment.qbs:3" "3" "standard pch file (gui)" "3" @@ -13204,18 +13093,6 @@ "qbsplugin.qbs" "4" "tools" "2" "cplusplustools.qbs" "3" -"cplusplus-keywordgen.qbs" "4" -"cplusplus-ast2png" "3" -"cplusplus-ast2png.qbs" "4" -"cplusplus-frontend" "3" -"cplusplus-frontend.qbs" "4" -"cplusplus-mkvisitor" "3" -"cplusplus-mkvisitor.qbs" "4" -"cplusplus-shared" "3" -"CPlusPlusTool.qbs" "4" -"CPlusPlusToolUsingCustomUtils.qbs" "4" -"cplusplus-update-frontend" "3" -"cplusplus-update-frontend.qbs" "4" "clangstaticanalyzer" "2" "clangstaticanalyzerautotest.qbs" "3" "cplusplus" "2" diff --git a/tests/system/suite_general/tst_openqt_creator/test.py b/tests/system/suite_general/tst_openqt_creator/test.py index 391c3d0bef..1c20800fe5 100644 --- a/tests/system/suite_general/tst_openqt_creator/test.py +++ b/tests/system/suite_general/tst_openqt_creator/test.py @@ -41,7 +41,7 @@ def main(): waitFor("runButton.enabled", 30000) # Starting before opening, because this is where Creator froze (QTCREATORBUG-10733) startopening = datetime.utcnow() - openQmakeProject(pathCreator, [Targets.DESKTOP_5_6_1_DEFAULT]) + openQmakeProject(pathCreator, [Targets.DESKTOP_5_10_1_DEFAULT]) # Wait for parsing to complete startreading = datetime.utcnow() waitFor("runButton.enabled", 300000) @@ -64,9 +64,9 @@ def main(): openGeneralMessages() # Verify messages appear once, from using default kit before configuring generalMessages = str(waitForObject(":Qt Creator_Core::OutputWindow").plainText) - test.compare(generalMessages.count("Project MESSAGE: Cannot build Qt Creator with Qt version 5.6.1."), 2, + test.compare(generalMessages.count("Project MESSAGE: Cannot build Qt Creator with Qt version 5.6.1."), 1, "Warning about outdated Qt shown?") - test.compare(generalMessages.count("Project ERROR: Use at least Qt 5.6.2."), 2, + test.compare(generalMessages.count("Project ERROR: Use at least Qt 5.6.2."), 1, "Minimum Qt version shown (once when parsing with default kit, once with selected)?") # Verify that qmljs.g is in the project even when we don't know where (QTCREATORBUG-17609) |