From 8479cb1514ae1eb9ec084103dfa2dc0b9c175524 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 11 May 2022 11:56:26 +0200 Subject: [PATCH] McuSupport: Fix tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Note, this also changes how the CMAKE_TOOLCHAIN_FILE is stored inside the settings. Change-Id: I018cc44be37deef36d685eb856bb706f47274017 Reviewed-by: Piotr Mućko Reviewed-by: Alessandro Portale --- src/plugins/mcusupport/mcukitmanager.cpp | 2 +- src/plugins/mcusupport/test/unittest.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/mcusupport/mcukitmanager.cpp b/src/plugins/mcusupport/mcukitmanager.cpp index c856c19e5d3..bcf17168079 100644 --- a/src/plugins/mcusupport/mcukitmanager.cpp +++ b/src/plugins/mcusupport/mcukitmanager.cpp @@ -256,7 +256,7 @@ public: const FilePath cMakeToolchainFile = mcuTarget->toolChainFilePackage()->path(); configMap.insert(Constants::TOOLCHAIN_FILE_CMAKE_VARIABLE, - cMakeToolchainFile.toUserOutput().toUtf8()); + cMakeToolchainFile.toString().toUtf8()); if (!cMakeToolchainFile.exists()) { printMessage( McuTarget::tr( diff --git a/src/plugins/mcusupport/test/unittest.cpp b/src/plugins/mcusupport/test/unittest.cpp index 534abf3e18f..4e18b4576fd 100644 --- a/src/plugins/mcusupport/test/unittest.cpp +++ b/src/plugins/mcusupport/test/unittest.cpp @@ -207,7 +207,7 @@ void verifyTargetToolchains(const Targets &targets, const auto toolchainCompiler{target->toolChainPackage()}; QVERIFY(toolchainCompiler); QCOMPARE(toolchainCompiler->cmakeVariableName(), Constants::TOOLCHAIN_DIR_CMAKE_VARIABLE); - QCOMPARE(toolchainCompiler->path().toUserOutput(), compilerPath); + QCOMPARE(toolchainCompiler->path().toString(), compilerPath); QCOMPARE(toolchainCompiler->settingsKey(), compilerSetting); } @@ -367,7 +367,7 @@ void McuSupportTest::test_parseToolchainFromJSON() QCOMPARE(toolchainFilePackage.label, cmakeToolchainLabel); QCOMPARE(toolchainFilePackage.envVar, QString{}); 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() @@ -702,7 +702,7 @@ void McuSupportTest::test_legacy_createUnsupportedToolchainFilePackage() auto unsupportedToolchainFile = legacyTargetFactory.getToolchainFile(qtForMcuSdkPath, iar); QVERIFY(unsupportedToolchainFile); - QCOMPARE(unsupportedToolchainFile->path().toUserOutput(), unsupportedToolchainFilePath); + QCOMPARE(unsupportedToolchainFile->path().toString(), unsupportedToolchainFilePath); QCOMPARE(unsupportedToolchainFile->cmakeVariableName(), Constants::TOOLCHAIN_FILE_CMAKE_VARIABLE); }