From e8b25f1e757ddb6df49c489964c9ca7e15e7a401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Mu=C4=87ko?= Date: Fri, 29 Jul 2022 10:06:45 +0200 Subject: [PATCH] McuSupport: Tests fixup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ida4fab44f9e3736efb0253d4c270981ecc544e2c Reviewed-by: Yasser Grimes Reviewed-by: Dawid Śliwa Reviewed-by: hjk --- src/plugins/mcusupport/test/armgcc_nxp_1050_json.h | 2 +- src/plugins/mcusupport/test/unittest.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/mcusupport/test/armgcc_nxp_1050_json.h b/src/plugins/mcusupport/test/armgcc_nxp_1050_json.h index c9d733637bb..8ffa686378f 100644 --- a/src/plugins/mcusupport/test/armgcc_nxp_1050_json.h +++ b/src/plugins/mcusupport/test/armgcc_nxp_1050_json.h @@ -81,7 +81,7 @@ constexpr auto armgcc_nxp_1050_json = R"({ "label": "CMake Toolchain File", "cmakeVar": "CMAKE_TOOLCHAIN_FILE", "type": "file", - "defaultValue": "$Qul_ROOT//lib/cmake/Qul/toolchain/armgcc.cmake", + "defaultValue": "/opt/qtformcu/2.2/lib/cmake/Qul/toolchain/armgcc.cmake", "visible": false, "optional": false } diff --git a/src/plugins/mcusupport/test/unittest.cpp b/src/plugins/mcusupport/test/unittest.cpp index 09d28eed83d..39e93c6cec9 100644 --- a/src/plugins/mcusupport/test/unittest.cpp +++ b/src/plugins/mcusupport/test/unittest.cpp @@ -941,7 +941,8 @@ void McuSupportTest::test_legacy_createQtMCUsPackage() QVERIFY(qtForMCUsSDK); QCOMPARE(qtForMCUsSDK->settingsKey(), Constants::SETTINGS_KEY_PACKAGE_QT_FOR_MCUS_SDK); QCOMPARE(qtForMCUsSDK->detectionPath(), - Legacy::Constants::QT_FOR_MCUS_SDK_PACKAGE_VALIDATION_PATH); + FilePath::fromUserInput(Legacy::Constants::QT_FOR_MCUS_SDK_PACKAGE_VALIDATION_PATH) + .withExecutableSuffix()); QCOMPARE(qtForMCUsSDK->path().toString(), qtForMcuSdkPath); }