Squish: Update expected project trees when opening qtcreator

- Update Creator's sources to v4.2.2
- Update project trees to what Creator 4.3 shows

If needed, two separate changes are in codereview.

Change-Id: I16ee341653c8b916b15208f16699c0d4cbf6df05
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Robert Loehning
2017-06-07 15:00:09 +02:00
parent 98237b5176
commit 600dd3a585
4 changed files with 6876 additions and 3909 deletions

View File

@@ -17,7 +17,7 @@ Fourth - you'll have to provide some additional repositories (and for the hookin
These additional repositories are located inside ~/QtSDK/src or C:\QtSDK\src (depending on the OS you're on).
You can also just provide them inside a different folder and specify the folder with the environment variable SYSTEST_SRCPATH.
This folder must contain the following:
* a QtCreator repository (or source copy) of tag v4.1.0-beta1 named 'creator' including the submodule src/shared/qbs
* a QtCreator repository (or source copy) of tag v4.2.2 named 'creator' including the submodule src/shared/qbs
* a subfolder called 'creator-test-data'
* 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

View File

@@ -66,7 +66,7 @@ def main():
generalMessages = str(waitForObject(":Qt Creator_Core::OutputWindow").plainText)
test.compare(generalMessages.count("Project MESSAGE: Cannot build Qt Creator with Qt version 5.3.1."), 1,
"Warning about outdated Qt shown?")
test.compare(generalMessages.count("Project ERROR: Use at least Qt 5.5.0."), 1,
test.compare(generalMessages.count("Project ERROR: Use at least Qt 5.6.0."), 1,
"Minimum Qt version shown?")
# Verify that qmljs.g is in the project even when we don't know where (QTCREATORBUG-17609)