From 531e1a572e9c19c6deee56bc0898bd477982547d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sivert=20Kr=C3=B8vel?= Date: Tue, 27 Sep 2022 12:10:23 +0200 Subject: [PATCH] McuSupport: Add flag in JSON for adding a package path to system path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit An entry called "addToSystemPath" was added to JSON files to signal whether the corresponding path should also be added to the system path. Task-number: UL-6409 Change-Id: I2d7ba38b3905d67475a3c482692e4f8e21d4141e Reviewed-by: Reviewed-by: Piotr Mućko Reviewed-by: hjk (cherry picked from commit fb643db0885ebefffe86f876fdbb6d403f5baafe) Reviewed-by: Alessandro Portale --- src/plugins/mcusupport/mcusupportsdk.cpp | 2 +- src/plugins/mcusupport/mcutargetfactory.cpp | 3 ++- .../test/armgcc_ek_ra6m3g_baremetal_json.h | 3 ++- .../test/armgcc_ek_ra6m3g_freertos_json.h | 3 ++- .../test/armgcc_mimxrt1050_evk_baremetal_json.h | 3 ++- .../test/armgcc_mimxrt1050_evk_freertos_json.h | 3 ++- .../test/armgcc_mimxrt1060_evk_baremetal_json.h | 3 ++- .../test/armgcc_mimxrt1064_evk_baremetal_json.h | 3 ++- .../test/armgcc_mimxrt1064_evk_freertos_json.h | 3 ++- .../test/armgcc_mimxrt1170_evk_freertos_json.h | 3 ++- ...armgcc_stm32f469i_discovery_baremetal_json.h | 3 ++- ...armgcc_stm32f769i_discovery_baremetal_json.h | 3 ++- .../armgcc_stm32f769i_discovery_freertos_json.h | 3 ++- ...armgcc_stm32h750b_discovery_baremetal_json.h | 3 ++- .../test/ghs_rh850_d1m1a_baremetal_json.h | 3 ++- .../test/ghs_tviic2d4m_baremetal_json.h | 3 ++- .../test/ghs_tviic2d6m_baremetal_json.h | 3 ++- .../test/iar_ek_ra6m3g_baremetal_json.h | 3 ++- .../test/iar_ek_ra6m3g_freertos_json.h | 3 ++- .../test/iar_mimxrt1050_evk_baremetal_json.h | 3 ++- .../test/iar_mimxrt1050_evk_freertos_json.h | 3 ++- .../test/iar_mimxrt1060_evk_baremetal_json.h | 3 ++- .../test/iar_mimxrt1064_evk_baremetal_json.h | 3 ++- .../test/iar_mimxrt1064_evk_freertos_json.h | 3 ++- .../test/iar_mimxrt1170_evk_freertos_json.h | 3 ++- .../iar_stm32f469i_discovery_baremetal_json.h | 3 ++- .../iar_stm32f769i_discovery_baremetal_json.h | 3 ++- .../iar_stm32f769i_discovery_freertos_json.h | 3 ++- .../iar_stm32h750b_discovery_baremetal_json.h | 3 ++- .../test/iar_tviic2d6m_baremetal_json.h | 3 ++- src/plugins/mcusupport/test/unittest.cpp | 17 +++++++++++++++++ src/plugins/mcusupport/test/unittest.h | 1 + 32 files changed, 77 insertions(+), 30 deletions(-) diff --git a/src/plugins/mcusupport/mcusupportsdk.cpp b/src/plugins/mcusupport/mcusupportsdk.cpp index cea595d2d89..f9213d00f7c 100644 --- a/src/plugins/mcusupport/mcusupportsdk.cpp +++ b/src/plugins/mcusupport/mcusupportsdk.cpp @@ -649,7 +649,7 @@ static PackageDescription parsePackage(const QJsonObject &cmakeEntry) FilePath::fromUserInput(cmakeEntry["validation"].toString()), versions, parseVersionDetection(cmakeEntry), - false}; + cmakeEntry["addToSystemPath"].toBool()}; } static QList parsePackages(const QJsonArray &cmakeEntries) diff --git a/src/plugins/mcusupport/mcutargetfactory.cpp b/src/plugins/mcusupport/mcutargetfactory.cpp index e6fb8c41d58..91229bd2418 100644 --- a/src/plugins/mcusupport/mcutargetfactory.cpp +++ b/src/plugins/mcusupport/mcutargetfactory.cpp @@ -140,7 +140,8 @@ McuPackagePtr McuTargetFactory::createPackage(const PackageDescription &pkgDesc) pkgDesc.envVar, pkgDesc.versions, {}, - createVersionDetection(pkgDesc.versionDetection)}}; + createVersionDetection(pkgDesc.versionDetection), + pkgDesc.shouldAddToSystemPath}}; } McuToolChainPackage *McuTargetFactory::createToolchain( diff --git a/src/plugins/mcusupport/test/armgcc_ek_ra6m3g_baremetal_json.h b/src/plugins/mcusupport/test/armgcc_ek_ra6m3g_baremetal_json.h index c4da86afb40..92b3c733dab 100644 --- a/src/plugins/mcusupport/test/armgcc_ek_ra6m3g_baremetal_json.h +++ b/src/plugins/mcusupport/test/armgcc_ek_ra6m3g_baremetal_json.h @@ -24,7 +24,8 @@ constexpr auto armgcc_ek_ra6m3g_baremetal_json = R"( "windows": "%{Env:PROGRAMSANDFILES}/SEGGER/JLink", "unix": "/opt/SEGGER/JLink" }, - "optional": true + "optional": true, + "addToSystemPath": true } ] }, diff --git a/src/plugins/mcusupport/test/armgcc_ek_ra6m3g_freertos_json.h b/src/plugins/mcusupport/test/armgcc_ek_ra6m3g_freertos_json.h index a7dc79022af..e347828d093 100644 --- a/src/plugins/mcusupport/test/armgcc_ek_ra6m3g_freertos_json.h +++ b/src/plugins/mcusupport/test/armgcc_ek_ra6m3g_freertos_json.h @@ -24,7 +24,8 @@ constexpr auto armgcc_ek_ra6m3g_freertos_json = R"( "windows": "%{Env:PROGRAMSANDFILES}/SEGGER/JLink", "unix": "/opt/SEGGER/JLink" }, - "optional": true + "optional": true, + "addToSystemPath": true } ] }, diff --git a/src/plugins/mcusupport/test/armgcc_mimxrt1050_evk_baremetal_json.h b/src/plugins/mcusupport/test/armgcc_mimxrt1050_evk_baremetal_json.h index 1b91b062925..a6a6fc2f796 100644 --- a/src/plugins/mcusupport/test/armgcc_mimxrt1050_evk_baremetal_json.h +++ b/src/plugins/mcusupport/test/armgcc_mimxrt1050_evk_baremetal_json.h @@ -27,7 +27,8 @@ constexpr auto armgcc_mimxrt1050_evk_baremetal_json = R"( "versionDetection": { "filePattern": "ide/binaries/crt_emu_cm_redlink" }, - "optional": false + "optional": false, + "addToSystemPath": true } ] }, diff --git a/src/plugins/mcusupport/test/armgcc_mimxrt1050_evk_freertos_json.h b/src/plugins/mcusupport/test/armgcc_mimxrt1050_evk_freertos_json.h index 3b6887f914f..1d3eb8eeb23 100644 --- a/src/plugins/mcusupport/test/armgcc_mimxrt1050_evk_freertos_json.h +++ b/src/plugins/mcusupport/test/armgcc_mimxrt1050_evk_freertos_json.h @@ -27,7 +27,8 @@ constexpr auto armgcc_mimxrt1050_evk_freertos_json = R"( "versionDetection": { "filePattern": "ide/binaries/crt_emu_cm_redlink" }, - "optional": false + "optional": false, + "addToSystemPath": true } ] }, diff --git a/src/plugins/mcusupport/test/armgcc_mimxrt1060_evk_baremetal_json.h b/src/plugins/mcusupport/test/armgcc_mimxrt1060_evk_baremetal_json.h index 8cb4679cedc..f8a164cdf33 100644 --- a/src/plugins/mcusupport/test/armgcc_mimxrt1060_evk_baremetal_json.h +++ b/src/plugins/mcusupport/test/armgcc_mimxrt1060_evk_baremetal_json.h @@ -23,7 +23,8 @@ constexpr auto armgcc_mimxrt1060_evk_baremetal_json = R"( "windows": "%{Env:ROOT}/nxp/MCUXpressoIDE*", "unix": "/usr/local/mcuxpressoide/" }, - "optional": false + "optional": false, + "addToSystemPath": true } ] }, diff --git a/src/plugins/mcusupport/test/armgcc_mimxrt1064_evk_baremetal_json.h b/src/plugins/mcusupport/test/armgcc_mimxrt1064_evk_baremetal_json.h index 3683818f2a6..21d760fb13e 100644 --- a/src/plugins/mcusupport/test/armgcc_mimxrt1064_evk_baremetal_json.h +++ b/src/plugins/mcusupport/test/armgcc_mimxrt1064_evk_baremetal_json.h @@ -27,7 +27,8 @@ constexpr auto armgcc_mimxrt1064_evk_baremetal_json = R"( "versionDetection": { "filePattern": "ide/binaries/crt_emu_cm_redlink" }, - "optional": false + "optional": false, + "addToSystemPath": true } ] }, diff --git a/src/plugins/mcusupport/test/armgcc_mimxrt1064_evk_freertos_json.h b/src/plugins/mcusupport/test/armgcc_mimxrt1064_evk_freertos_json.h index c2778bd61e6..e0b6ae8db10 100644 --- a/src/plugins/mcusupport/test/armgcc_mimxrt1064_evk_freertos_json.h +++ b/src/plugins/mcusupport/test/armgcc_mimxrt1064_evk_freertos_json.h @@ -27,7 +27,8 @@ constexpr auto armgcc_mimxrt1064_evk_freertos_json = R"( "versionDetection": { "filePattern": "ide/binaries/crt_emu_cm_redlink" }, - "optional": false + "optional": false, + "addToSystemPath": true } ] }, diff --git a/src/plugins/mcusupport/test/armgcc_mimxrt1170_evk_freertos_json.h b/src/plugins/mcusupport/test/armgcc_mimxrt1170_evk_freertos_json.h index 16918857ad3..23407137161 100644 --- a/src/plugins/mcusupport/test/armgcc_mimxrt1170_evk_freertos_json.h +++ b/src/plugins/mcusupport/test/armgcc_mimxrt1170_evk_freertos_json.h @@ -27,7 +27,8 @@ constexpr auto armgcc_mimxrt1170_evk_freertos_json = R"( "versionDetection": { "filePattern": "ide/binaries/crt_emu_cm_redlink" }, - "optional": false + "optional": false, + "addToSystemPath": true } ] }, diff --git a/src/plugins/mcusupport/test/armgcc_stm32f469i_discovery_baremetal_json.h b/src/plugins/mcusupport/test/armgcc_stm32f469i_discovery_baremetal_json.h index 9dff84e6f08..763e039b548 100644 --- a/src/plugins/mcusupport/test/armgcc_stm32f469i_discovery_baremetal_json.h +++ b/src/plugins/mcusupport/test/armgcc_stm32f469i_discovery_baremetal_json.h @@ -22,7 +22,8 @@ constexpr auto armgcc_stm32f469i_discovery_baremetal_json = R"( "windows": "%{Env:PROGRAMSANDFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/", "unix": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/" }, - "optional": false + "optional": false, + "addToSystemPath": true } ] }, diff --git a/src/plugins/mcusupport/test/armgcc_stm32f769i_discovery_baremetal_json.h b/src/plugins/mcusupport/test/armgcc_stm32f769i_discovery_baremetal_json.h index 5e85ada4362..405c25f934a 100644 --- a/src/plugins/mcusupport/test/armgcc_stm32f769i_discovery_baremetal_json.h +++ b/src/plugins/mcusupport/test/armgcc_stm32f769i_discovery_baremetal_json.h @@ -23,7 +23,8 @@ constexpr auto armgcc_stm32f769i_discovery_baremetal_json = R"( "windows": "%{Env:PROGRAMSANDFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/", "unix": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/" }, - "optional": false + "optional": false, + "addToSystemPath": true } ] }, diff --git a/src/plugins/mcusupport/test/armgcc_stm32f769i_discovery_freertos_json.h b/src/plugins/mcusupport/test/armgcc_stm32f769i_discovery_freertos_json.h index 60742512cc5..c061bd19e8b 100644 --- a/src/plugins/mcusupport/test/armgcc_stm32f769i_discovery_freertos_json.h +++ b/src/plugins/mcusupport/test/armgcc_stm32f769i_discovery_freertos_json.h @@ -23,7 +23,8 @@ constexpr auto armgcc_stm32f769i_discovery_freertos_json = R"( "windows": "%{Env:PROGRAMSANDFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/", "unix": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/" }, - "optional": false + "optional": false, + "addToSystemPath": true } ] }, diff --git a/src/plugins/mcusupport/test/armgcc_stm32h750b_discovery_baremetal_json.h b/src/plugins/mcusupport/test/armgcc_stm32h750b_discovery_baremetal_json.h index 78c09d5cadf..66af227d7b0 100644 --- a/src/plugins/mcusupport/test/armgcc_stm32h750b_discovery_baremetal_json.h +++ b/src/plugins/mcusupport/test/armgcc_stm32h750b_discovery_baremetal_json.h @@ -23,7 +23,8 @@ constexpr auto armgcc_stm32h750b_discovery_baremetal_json = R"( "windows": "%{Env:PROGRAMSANDFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/", "unix": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/" }, - "optional": false + "optional": false, + "addToSystemPath": true } ] }, diff --git a/src/plugins/mcusupport/test/ghs_rh850_d1m1a_baremetal_json.h b/src/plugins/mcusupport/test/ghs_rh850_d1m1a_baremetal_json.h index d44d672b0ea..bac50527196 100644 --- a/src/plugins/mcusupport/test/ghs_rh850_d1m1a_baremetal_json.h +++ b/src/plugins/mcusupport/test/ghs_rh850_d1m1a_baremetal_json.h @@ -25,7 +25,8 @@ constexpr auto ghs_rh850_d1m1a_baremetal_json = R"( "unix": "%{Env:HOME}" }, "envVar": "RenesasFlashProgrammer_PATH", - "optional": true + "optional": true, + "addToSystemPath": true } ] }, diff --git a/src/plugins/mcusupport/test/ghs_tviic2d4m_baremetal_json.h b/src/plugins/mcusupport/test/ghs_tviic2d4m_baremetal_json.h index a2c31c289a2..c10f1f052fc 100644 --- a/src/plugins/mcusupport/test/ghs_tviic2d4m_baremetal_json.h +++ b/src/plugins/mcusupport/test/ghs_tviic2d4m_baremetal_json.h @@ -19,7 +19,8 @@ constexpr auto ghs_tviic2d4m_baremetal_json = R"( "label": "Cypress Auto Flash Utility", "type": "path", "cmakeVar": "INFINEON_AUTO_FLASH_UTILITY_DIR", - "optional": false + "optional": false, + "addToSystemPath": true } ] }, diff --git a/src/plugins/mcusupport/test/ghs_tviic2d6m_baremetal_json.h b/src/plugins/mcusupport/test/ghs_tviic2d6m_baremetal_json.h index d10a28097a7..1f8b6bbb6dd 100644 --- a/src/plugins/mcusupport/test/ghs_tviic2d6m_baremetal_json.h +++ b/src/plugins/mcusupport/test/ghs_tviic2d6m_baremetal_json.h @@ -19,7 +19,8 @@ constexpr auto ghs_tviic2d6m_baremetal_json = R"( "label": "Cypress Auto Flash Utility", "type": "path", "cmakeVar": "INFINEON_AUTO_FLASH_UTILITY_DIR", - "optional": false + "optional": false, + "addToSystemPath": true } ] }, diff --git a/src/plugins/mcusupport/test/iar_ek_ra6m3g_baremetal_json.h b/src/plugins/mcusupport/test/iar_ek_ra6m3g_baremetal_json.h index 311cdc5dcb4..3df8455c07d 100644 --- a/src/plugins/mcusupport/test/iar_ek_ra6m3g_baremetal_json.h +++ b/src/plugins/mcusupport/test/iar_ek_ra6m3g_baremetal_json.h @@ -24,7 +24,8 @@ constexpr auto iar_ek_ra6m3g_baremetal_json = R"( "windows": "%{Env:PROGRAMSANDFILES}/SEGGER/JLink", "unix": "/opt/SEGGER/JLink" }, - "optional": true + "optional": true, + "addToSystemPath": true } ] }, diff --git a/src/plugins/mcusupport/test/iar_ek_ra6m3g_freertos_json.h b/src/plugins/mcusupport/test/iar_ek_ra6m3g_freertos_json.h index ef9e0d9b348..570259672cf 100644 --- a/src/plugins/mcusupport/test/iar_ek_ra6m3g_freertos_json.h +++ b/src/plugins/mcusupport/test/iar_ek_ra6m3g_freertos_json.h @@ -24,7 +24,8 @@ constexpr auto iar_ek_ra6m3g_freertos_json = R"( "windows": "%{Env:PROGRAMSANDFILES}/SEGGER/JLink", "unix": "/opt/SEGGER/JLink" }, - "optional": true + "optional": true, + "addToSystemPath": true } ] }, diff --git a/src/plugins/mcusupport/test/iar_mimxrt1050_evk_baremetal_json.h b/src/plugins/mcusupport/test/iar_mimxrt1050_evk_baremetal_json.h index 42092c4edc3..9903abd6c84 100644 --- a/src/plugins/mcusupport/test/iar_mimxrt1050_evk_baremetal_json.h +++ b/src/plugins/mcusupport/test/iar_mimxrt1050_evk_baremetal_json.h @@ -27,7 +27,8 @@ constexpr auto iar_mimxrt1050_evk_baremetal_json = R"( "versionDetection": { "filePattern": "ide/binaries/crt_emu_cm_redlink" }, - "optional": false + "optional": false, + "addToSystemPath": true } ] }, diff --git a/src/plugins/mcusupport/test/iar_mimxrt1050_evk_freertos_json.h b/src/plugins/mcusupport/test/iar_mimxrt1050_evk_freertos_json.h index d069b90759a..c5c0cee2d4c 100644 --- a/src/plugins/mcusupport/test/iar_mimxrt1050_evk_freertos_json.h +++ b/src/plugins/mcusupport/test/iar_mimxrt1050_evk_freertos_json.h @@ -27,7 +27,8 @@ constexpr auto iar_mimxrt1050_evk_freertos_json = R"( "versionDetection": { "filePattern": "ide/binaries/crt_emu_cm_redlink" }, - "optional": false + "optional": false, + "addToSystemPath": true } ] }, diff --git a/src/plugins/mcusupport/test/iar_mimxrt1060_evk_baremetal_json.h b/src/plugins/mcusupport/test/iar_mimxrt1060_evk_baremetal_json.h index 4131601d2a5..5ad87a16c56 100644 --- a/src/plugins/mcusupport/test/iar_mimxrt1060_evk_baremetal_json.h +++ b/src/plugins/mcusupport/test/iar_mimxrt1060_evk_baremetal_json.h @@ -27,7 +27,8 @@ constexpr auto iar_mimxrt1060_evk_baremetal_json = R"( "versionDetection": { "filePattern": "ide/binaries/crt_emu_cm_redlink" }, - "optional": false + "optional": false, + "addToSystemPath": true } ] }, diff --git a/src/plugins/mcusupport/test/iar_mimxrt1064_evk_baremetal_json.h b/src/plugins/mcusupport/test/iar_mimxrt1064_evk_baremetal_json.h index ec582712703..634d3b92505 100644 --- a/src/plugins/mcusupport/test/iar_mimxrt1064_evk_baremetal_json.h +++ b/src/plugins/mcusupport/test/iar_mimxrt1064_evk_baremetal_json.h @@ -27,7 +27,8 @@ constexpr auto iar_mimxrt1064_evk_baremetal_json = R"( "versionDetection": { "filePattern": "ide/binaries/crt_emu_cm_redlink" }, - "optional": false + "optional": false, + "addToSystemPath": true } ] }, diff --git a/src/plugins/mcusupport/test/iar_mimxrt1064_evk_freertos_json.h b/src/plugins/mcusupport/test/iar_mimxrt1064_evk_freertos_json.h index 83255e94c75..8a223c2a6db 100644 --- a/src/plugins/mcusupport/test/iar_mimxrt1064_evk_freertos_json.h +++ b/src/plugins/mcusupport/test/iar_mimxrt1064_evk_freertos_json.h @@ -27,7 +27,8 @@ constexpr auto iar_mimxrt1064_evk_freertos_json = R"( "versionDetection": { "filePattern": "ide/binaries/crt_emu_cm_redlink" }, - "optional": false + "optional": false, + "addToSystemPath": true } ] }, diff --git a/src/plugins/mcusupport/test/iar_mimxrt1170_evk_freertos_json.h b/src/plugins/mcusupport/test/iar_mimxrt1170_evk_freertos_json.h index 51c9e21a805..c77aa9c3f32 100644 --- a/src/plugins/mcusupport/test/iar_mimxrt1170_evk_freertos_json.h +++ b/src/plugins/mcusupport/test/iar_mimxrt1170_evk_freertos_json.h @@ -27,7 +27,8 @@ constexpr auto iar_mimxrt1170_evk_freertos_json = R"( "versionDetection": { "filePattern": "ide/binaries/crt_emu_cm_redlink" }, - "optional": false + "optional": false, + "addToSystemPath": true } ] }, diff --git a/src/plugins/mcusupport/test/iar_stm32f469i_discovery_baremetal_json.h b/src/plugins/mcusupport/test/iar_stm32f469i_discovery_baremetal_json.h index af002fa7fa3..74f1012f61c 100644 --- a/src/plugins/mcusupport/test/iar_stm32f469i_discovery_baremetal_json.h +++ b/src/plugins/mcusupport/test/iar_stm32f469i_discovery_baremetal_json.h @@ -22,7 +22,8 @@ constexpr auto iar_stm32f469i_discovery_baremetal_json = R"( "windows": "%{Env:PROGRAMSANDFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/", "unix": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/" }, - "optional": false + "optional": false, + "addToSystemPath": true } ] }, diff --git a/src/plugins/mcusupport/test/iar_stm32f769i_discovery_baremetal_json.h b/src/plugins/mcusupport/test/iar_stm32f769i_discovery_baremetal_json.h index bb749ae5e39..8ff4c748cde 100644 --- a/src/plugins/mcusupport/test/iar_stm32f769i_discovery_baremetal_json.h +++ b/src/plugins/mcusupport/test/iar_stm32f769i_discovery_baremetal_json.h @@ -23,7 +23,8 @@ constexpr auto iar_stm32f769i_discovery_baremetal_json = R"( "windows": "%{Env:PROGRAMSANDFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/", "unix": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/" }, - "optional": false + "optional": false, + "addToSystemPath": true } ] }, diff --git a/src/plugins/mcusupport/test/iar_stm32f769i_discovery_freertos_json.h b/src/plugins/mcusupport/test/iar_stm32f769i_discovery_freertos_json.h index 4200c61611d..2817aed3a0d 100644 --- a/src/plugins/mcusupport/test/iar_stm32f769i_discovery_freertos_json.h +++ b/src/plugins/mcusupport/test/iar_stm32f769i_discovery_freertos_json.h @@ -23,7 +23,8 @@ constexpr auto iar_stm32f769i_discovery_freertos_json = R"( "windows": "%{Env:PROGRAMSANDFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/", "unix": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/" }, - "optional": false + "optional": false, + "addToSystemPath": true } ] }, diff --git a/src/plugins/mcusupport/test/iar_stm32h750b_discovery_baremetal_json.h b/src/plugins/mcusupport/test/iar_stm32h750b_discovery_baremetal_json.h index a272a3a4800..836cdde05d0 100644 --- a/src/plugins/mcusupport/test/iar_stm32h750b_discovery_baremetal_json.h +++ b/src/plugins/mcusupport/test/iar_stm32h750b_discovery_baremetal_json.h @@ -23,7 +23,8 @@ constexpr auto iar_stm32h750b_discovery_baremetal_json = R"( "windows": "%{Env:PROGRAMSANDFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/", "unix": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/" }, - "optional": false + "optional": false, + "addToSystemPath": true } ] }, diff --git a/src/plugins/mcusupport/test/iar_tviic2d6m_baremetal_json.h b/src/plugins/mcusupport/test/iar_tviic2d6m_baremetal_json.h index 78520e48d24..2b5ec845bf4 100644 --- a/src/plugins/mcusupport/test/iar_tviic2d6m_baremetal_json.h +++ b/src/plugins/mcusupport/test/iar_tviic2d6m_baremetal_json.h @@ -19,7 +19,8 @@ constexpr auto iar_tviic2d6m_baremetal_json = R"( "label": "Cypress Auto Flash Utility", "type": "path", "cmakeVar": "INFINEON_AUTO_FLASH_UTILITY_DIR", - "optional": false + "optional": false, + "addToSystemPath": true } ] }, diff --git a/src/plugins/mcusupport/test/unittest.cpp b/src/plugins/mcusupport/test/unittest.cpp index 0e441a2d60b..64301f3009d 100644 --- a/src/plugins/mcusupport/test/unittest.cpp +++ b/src/plugins/mcusupport/test/unittest.cpp @@ -1454,4 +1454,21 @@ void McuSupportTest::test_defaultValueForEachOperationSystem() else QCOMPARE(QString("/usr/local/mcuxpressoide"), default_path_entry); }; +void McuSupportTest::test_addToSystemPathFlag() +{ + const auto targetDescription = parseDescriptionJson(armgcc_stm32f769i_discovery_freertos_json); + + const auto programmerPackage = targetDescription.platform.entries[0]; + const auto compilerPackage = targetDescription.toolchain.compiler; + const auto toolchainFilePackage = targetDescription.toolchain.file; + const auto boardSdkPackage = targetDescription.boardSdk; + const auto freeRtosPackage = targetDescription.freeRTOS.package; + + QCOMPARE(programmerPackage.shouldAddToSystemPath, true); + QCOMPARE(compilerPackage.shouldAddToSystemPath, false); + QCOMPARE(toolchainFilePackage.shouldAddToSystemPath, false); + QCOMPARE(boardSdkPackage.shouldAddToSystemPath, false); + QCOMPARE(freeRtosPackage.shouldAddToSystemPath, false); +} + } // namespace McuSupport::Internal::Test diff --git a/src/plugins/mcusupport/test/unittest.h b/src/plugins/mcusupport/test/unittest.h index 732d636f3ac..be46281beba 100644 --- a/src/plugins/mcusupport/test/unittest.h +++ b/src/plugins/mcusupport/test/unittest.h @@ -96,6 +96,7 @@ private slots: void test_legacy_createThirdPartyPackage(); void test_defaultValueForEachOperationSystem(); + void test_addToSystemPathFlag(); private: QVersionNumber currentQulVersion{2, 0};