feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

sdktool: Adapt tests

Browse Source 
The names for registered Qt, cmake and toolchain must
no more be unique.
Amends e9e4c27e3a.

Change-Id: Icea00636f3632148f209616de3473816e12e4655
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Christian Stenger
2019-05-29 13:35:37 +02:00
parent 1ef76e3dd7
commit d73c271259
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/tools/sdktool/addtoolchainoperation.cpp
View File

@@ -199,7 +199,7 @@ bool AddToolChainOperation::test() const
if (!unchanged.isEmpty())
return false;
// Make sure name stays unique:
// add 2nd tool chain:
map = addToolChain(map, "{some-tc-id}", "langId2", "name", "/tmp/test", "test-abi", "test-abi,test-abi2",
KeyValuePairList() << KeyValuePair("ExtraKey", QVariant("ExtraValue")));
if (map.value(COUNT).toInt() != 2
@@ -221,7 +221,7 @@ bool AddToolChainOperation::test() const
if (tcData.count() != 8
|| tcData.value(ID).toString() != "{some-tc-id}"
|| tcData.value(LANGUAGE_KEY_V2).toString() != "langId2"
|| tcData.value(DISPLAYNAME).toString() != "name2"
|| tcData.value(DISPLAYNAME).toString() != "name"
|| tcData.value(AUTODETECTED).toBool() != true
|| tcData.value(PATH).toString() != "/tmp/test"
|| tcData.value(TARGET_ABI).toString() != "test-abi"