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

McuSupport: Fix tests

Browse Source 
Note, this also changes how the CMAKE_TOOLCHAIN_FILE is stored
inside the settings.

Change-Id: I018cc44be37deef36d685eb856bb706f47274017
Reviewed-by: Piotr Mućko <piotr.mucko@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Christian Stenger
2022-05-11 11:56:26 +02:00
parent dfe0776002
commit 8479cb1514
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/mcusupport/mcukitmanager.cpp
View File

@@ -256,7 +256,7 @@ public:
const FilePath cMakeToolchainFile = mcuTarget->toolChainFilePackage()->path(); const FilePath cMakeToolchainFile = mcuTarget->toolChainFilePackage()->path();
configMap.insert(Constants::TOOLCHAIN_FILE_CMAKE_VARIABLE, configMap.insert(Constants::TOOLCHAIN_FILE_CMAKE_VARIABLE,
cMakeToolchainFile.toUserOutput().toUtf8()); cMakeToolchainFile.toString().toUtf8());
if (!cMakeToolchainFile.exists()) { if (!cMakeToolchainFile.exists()) {
printMessage( printMessage(
McuTarget::tr( McuTarget::tr(

6
src/plugins/mcusupport/test/unittest.cpp
View File

@@ -207,7 +207,7 @@ void verifyTargetToolchains(const Targets &targets,
const auto toolchainCompiler{target->toolChainPackage()}; const auto toolchainCompiler{target->toolChainPackage()};
QVERIFY(toolchainCompiler); QVERIFY(toolchainCompiler);
QCOMPARE(toolchainCompiler->cmakeVariableName(), Constants::TOOLCHAIN_DIR_CMAKE_VARIABLE); QCOMPARE(toolchainCompiler->cmakeVariableName(), Constants::TOOLCHAIN_DIR_CMAKE_VARIABLE);
QCOMPARE(toolchainCompiler->path().toUserOutput(), compilerPath); QCOMPARE(toolchainCompiler->path().toString(), compilerPath);
QCOMPARE(toolchainCompiler->settingsKey(), compilerSetting); QCOMPARE(toolchainCompiler->settingsKey(), compilerSetting);
} }
@@ -367,7 +367,7 @@ void McuSupportTest::test_parseToolchainFromJSON()
QCOMPARE(toolchainFilePackage.label, cmakeToolchainLabel); QCOMPARE(toolchainFilePackage.label, cmakeToolchainLabel);
QCOMPARE(toolchainFilePackage.envVar, QString{}); QCOMPARE(toolchainFilePackage.envVar, QString{});
QCOMPARE(toolchainFilePackage.cmakeVar, Constants::TOOLCHAIN_FILE_CMAKE_VARIABLE); QCOMPARE(toolchainFilePackage.cmakeVar, Constants::TOOLCHAIN_FILE_CMAKE_VARIABLE);
QCOMPARE(toolchainFilePackage.defaultPath.cleanPath().toUserOutput(), toolchainFile); QCOMPARE(toolchainFilePackage.defaultPath.cleanPath().toString(), toolchainFile);
} }
void McuSupportTest::test_legacy_createIarToolchain() void McuSupportTest::test_legacy_createIarToolchain()
@@ -702,7 +702,7 @@ void McuSupportTest::test_legacy_createUnsupportedToolchainFilePackage()
auto unsupportedToolchainFile = legacyTargetFactory.getToolchainFile(qtForMcuSdkPath, iar); auto unsupportedToolchainFile = legacyTargetFactory.getToolchainFile(qtForMcuSdkPath, iar);
QVERIFY(unsupportedToolchainFile); QVERIFY(unsupportedToolchainFile);
QCOMPARE(unsupportedToolchainFile->path().toUserOutput(), unsupportedToolchainFilePath); QCOMPARE(unsupportedToolchainFile->path().toString(), unsupportedToolchainFilePath);
QCOMPARE(unsupportedToolchainFile->cmakeVariableName(), QCOMPARE(unsupportedToolchainFile->cmakeVariableName(),
Constants::TOOLCHAIN_FILE_CMAKE_VARIABLE); Constants::TOOLCHAIN_FILE_CMAKE_VARIABLE);
} }