diff options
| author | hjk <hjk@qt.io> | 2022-02-24 11:39:05 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2022-02-25 08:41:05 +0000 |
| commit | b178e407a4da94f632fd0ebeb2d194f6012b73ba (patch) | |
| tree | 07ff357cf713ea3d5d3046114658a0f7033c0533 /src/tools/sdktool/rmkitoperation.cpp | |
| parent | 44aba26a47aa922328f568c06e976b1b9bd49048 (diff) | |
SdkTool: Make auto test easier maintainable
Adding new kit items so far required touching test code in several
places.
Also, use more but simpler individual tests to find failing tests
quicker.
Change-Id: I540b93c01a6bdbb85353928713995c262dfc919e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Diffstat (limited to 'src/tools/sdktool/rmkitoperation.cpp')
| -rw-r--r-- | src/tools/sdktool/rmkitoperation.cpp | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/src/tools/sdktool/rmkitoperation.cpp b/src/tools/sdktool/rmkitoperation.cpp index 306cfc3bd7..a2148c86ee 100644 --- a/src/tools/sdktool/rmkitoperation.cpp +++ b/src/tools/sdktool/rmkitoperation.cpp @@ -116,22 +116,28 @@ bool RmKitOperation::test() const QHash<QString, QString> tcs; tcs.insert("Cxx", "{tc-id}"); - QVariantMap map = - AddKitData{"testId", "Test Qt Version", "/tmp/icon.png", QString(), 1, - "/usr/bin/gdb-test", "Desktop", QString(), QString(), tcs, - "{qt-id}", "unsupported/mkspec", - QString(), QString(), QString(), QString(), QString(), QStringList(), QStringList(), - {{"PE.Profile.Data/extraData", QVariant("extraValue")}}} - .addKit(AddKitData::initializeKits(), tcMap, qtMap, devMap, {}); - - - map = AddKitData{"testId2", "Test Qt Version", - "/tmp/icon2.png", QString(), 1, "/usr/bin/gdb-test2", - "Desktop", QString(), QString(), tcs, "{qt-id}", - "unsupported/mkspec2", - QString(), QString(), QString(), QString(), QString(), QStringList(), QStringList(), - {{"PE.Profile.Data/extraData", QVariant("extraValue2")}}} - .addKit(map, tcMap, qtMap, devMap, {}); + AddKitData kitData; + kitData.m_id = "testId"; + kitData.m_displayName = "Test Qt Version"; + kitData.m_icon = "/tmp/icon.png"; + kitData.m_debuggerEngine = 1; + kitData.m_debugger = "/usr/bin/gdb-test"; + kitData.m_deviceType = "Desktop"; + kitData.m_tcs = tcs; + kitData.m_qt = "{qt-id}"; + kitData.m_mkspec = "unsupported/mkspec"; + kitData.m_extra = {{"PE.Profile.Data/extraData", QVariant("extraValue")}}; + + QVariantMap map = kitData.addKit(AddKitData::initializeKits(), tcMap, qtMap, devMap, {}); + + + kitData.m_id = "testId2"; + kitData.m_icon = "/tmp/icon2.png"; + kitData.m_icon = "/usr/bin/gdb-test2"; + kitData.m_mkspec = "unsupported/mkspec2"; + kitData.m_extra = {{"PE.Profile.Data/extraData", QVariant("extraValue2")}}; + + map = kitData.addKit(map, tcMap, qtMap, devMap, {}); QVariantMap result = rmKit(map, "testId"); if (result.count() != 4 |