diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2019-05-29 13:35:37 +0200 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2019-06-03 05:55:32 +0000 |
| commit | d73c27125952bcce920a2abd55c7c3758e850ac0 (patch) | |
| tree | 35fb5508fcd5b1ee39eed929a6835cccf97ac9f0 /src/tools | |
| parent | 1ef76e3dd76ae84ae72084dcccb609fa9c82afb0 (diff) | |
sdktool: Adapt tests
The names for registered Qt, cmake and toolchain must
no more be unique.
Amends e9e4c27e3a3f157291a231b8a746bb76dea525b7.
Change-Id: Icea00636f3632148f209616de3473816e12e4655
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/sdktool/addcmakeoperation.cpp | 4 | ||||
| -rw-r--r-- | src/tools/sdktool/addqtoperation.cpp | 4 | ||||
| -rw-r--r-- | src/tools/sdktool/addtoolchainoperation.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/tools/sdktool/addcmakeoperation.cpp b/src/tools/sdktool/addcmakeoperation.cpp index 893b9c5b61..8a23fc42ca 100644 --- a/src/tools/sdktool/addcmakeoperation.cpp +++ b/src/tools/sdktool/addcmakeoperation.cpp @@ -157,7 +157,7 @@ bool AddCMakeOperation::test() const if (!unchanged.isEmpty()) return false; - // Make sure name stays unique: + // add 2nd cmake map = addCMake(map, "{some-cm-id}", "name", "/tmp/test", KeyValuePairList() << KeyValuePair("ExtraKey", QVariant("ExtraValue"))); if (map.value(COUNT).toInt() != 2 @@ -175,7 +175,7 @@ bool AddCMakeOperation::test() const cmData = map.value(QString::fromLatin1(PREFIX) + '1').toMap(); if (cmData.count() != 5 || cmData.value(ID_KEY).toString() != "{some-cm-id}" - || cmData.value(DISPLAYNAME_KEY).toString() != "name2" + || cmData.value(DISPLAYNAME_KEY).toString() != "name" || cmData.value(AUTODETECTED_KEY).toBool() != true || cmData.value(PATH_KEY).toString() != "/tmp/test" || cmData.value("ExtraKey").toString() != "ExtraValue") diff --git a/src/tools/sdktool/addqtoperation.cpp b/src/tools/sdktool/addqtoperation.cpp index 30ece83c65..3297eb8dbf 100644 --- a/src/tools/sdktool/addqtoperation.cpp +++ b/src/tools/sdktool/addqtoperation.cpp @@ -231,7 +231,7 @@ bool AddQtOperation::test() const if (!result.isEmpty()) return false; - // Make sure name is unique: + // add 2nd Qt version: map = addQt(map, QLatin1String("testId2"), QLatin1String("Test Qt Version"), QLatin1String("testType3"), QLatin1String("/tmp/test/qmake2"), KeyValuePairList() << KeyValuePair(QLatin1String("extraData"), QVariant(QLatin1String("extraValue"))), @@ -251,7 +251,7 @@ bool AddQtOperation::test() const || !version1.contains(QLatin1String(ID)) || version1.value(QLatin1String(ID)).toInt() != -1 || !version1.contains(QLatin1String(DISPLAYNAME)) - || version1.value(QLatin1String(DISPLAYNAME)).toString() != QLatin1String("Test Qt Version2") + || version1.value(QLatin1String(DISPLAYNAME)).toString() != QLatin1String("Test Qt Version") || !version1.contains(QLatin1String(AUTODETECTED)) || version1.value(QLatin1String(AUTODETECTED)).toBool() != true || !version1.contains(QLatin1String(AUTODETECTION_SOURCE)) diff --git a/src/tools/sdktool/addtoolchainoperation.cpp b/src/tools/sdktool/addtoolchainoperation.cpp index 0f5359cff3..afcab9a5e2 100644 --- a/src/tools/sdktool/addtoolchainoperation.cpp +++ b/src/tools/sdktool/addtoolchainoperation.cpp @@ -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" |