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

McuSupport: The armgcc version string does not contain 'v'

Browse Source 
Change-Id: Ic259bed17a97bccb64f427ce2054efc9d05b55f2
Reviewed-by: Dawid Śliwa <dawid.sliwa@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Rainer Keller
2022-10-19 13:30:29 +02:00
committed by Rainer Keller
parent d1a9cecf59
commit 9257a15a68
14 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/mcusupport/test/armgcc_ek_ra6m3g_baremetal_json.h
View File

@@ -45,7 +45,7 @@ constexpr auto armgcc_ek_ra6m3g_baremetal_json = R"(
"versionDetection": {
"filePattern": "bin/arm-none-eabi-g++",
"executableArgs": "--version",
"regex": "\\bv(\\d+\\.\\d+\\.\\d+)\\b"
"regex": "\\b(\\d+\\.\\d+\\.\\d+)\\b"
},
"detectionPath": {
"windows": "bin/arm-none-eabi-g++.exe",

2
src/plugins/mcusupport/test/armgcc_ek_ra6m3g_freertos_json.h
View File

@@ -45,7 +45,7 @@ constexpr auto armgcc_ek_ra6m3g_freertos_json = R"(
"versionDetection": {
"filePattern": "bin/arm-none-eabi-g++",
"executableArgs": "--version",
"regex": "\\bv(\\d+\\.\\d+\\.\\d+)\\b"
"regex": "\\b(\\d+\\.\\d+\\.\\d+)\\b"
},
"detectionPath": {
"windows": "bin/arm-none-eabi-g++.exe",

2
src/plugins/mcusupport/test/armgcc_example_baremetal_json.h
View File

@@ -30,7 +30,7 @@ constexpr auto armgcc_example_baremetal_json = R"(
"versionDetection": {
"filePattern": "bin/arm-none-eabi-g++",
"executableArgs": "--version",
"regex": "\\bv(\\d+\\.\\d+\\.\\d+)\\b"
"regex": "\\b(\\d+\\.\\d+\\.\\d+)\\b"
},
"detectionPath": {
"windows": "bin/arm-none-eabi-g++.exe",

2
src/plugins/mcusupport/test/armgcc_mimxrt1050_evk_baremetal_json.h
View File

@@ -49,7 +49,7 @@ constexpr auto armgcc_mimxrt1050_evk_baremetal_json = R"(
"versionDetection": {
"filePattern": "bin/arm-none-eabi-g++",
"executableArgs": "--version",
"regex": "\\bv(\\d+\\.\\d+\\.\\d+)\\b"
"regex": "\\b(\\d+\\.\\d+\\.\\d+)\\b"
},
"detectionPath": {
"windows": "bin/arm-none-eabi-g++.exe",

2
src/plugins/mcusupport/test/armgcc_mimxrt1050_evk_freertos_json.h
View File

@@ -49,7 +49,7 @@ constexpr auto armgcc_mimxrt1050_evk_freertos_json = R"(
"versionDetection": {
"filePattern": "bin/arm-none-eabi-g++",
"executableArgs": "--version",
"regex": "\\bv(\\d+\\.\\d+\\.\\d+)\\b"
"regex": "\\b(\\d+\\.\\d+\\.\\d+)\\b"
},
"detectionPath": {
"windows": "bin/arm-none-eabi-g++.exe",

2
src/plugins/mcusupport/test/armgcc_mimxrt1060_evk_baremetal_json.h
View File

@@ -48,7 +48,7 @@ constexpr auto armgcc_mimxrt1060_evk_baremetal_json = R"(
"versionDetection": {
"filePattern": "bin/arm-none-eabi-g++",
"executableArgs": "--version",
"regex": "\\bv(\\d+\\.\\d+\\.\\d+)\\b"
"regex": "\\b(\\d+\\.\\d+\\.\\d+)\\b"
},
"detectionPath": {
"windows": "bin/arm-none-eabi-g++.exe",

2
src/plugins/mcusupport/test/armgcc_mimxrt1064_evk_baremetal_json.h
View File

@@ -49,7 +49,7 @@ constexpr auto armgcc_mimxrt1064_evk_baremetal_json = R"(
"versionDetection": {
"filePattern": "bin/arm-none-eabi-g++",
"executableArgs": "--version",
"regex": "\\bv(\\d+\\.\\d+\\.\\d+)\\b"
"regex": "\\b(\\d+\\.\\d+\\.\\d+)\\b"
},
"detectionPath": {
"windows": "bin/arm-none-eabi-g++.exe",

2
src/plugins/mcusupport/test/armgcc_mimxrt1064_evk_freertos_json.h
View File

@@ -49,7 +49,7 @@ constexpr auto armgcc_mimxrt1064_evk_freertos_json = R"(
"versionDetection": {
"filePattern": "bin/arm-none-eabi-g++",
"executableArgs": "--version",
"regex": "\\bv(\\d+\\.\\d+\\.\\d+)\\b"
"regex": "\\b(\\d+\\.\\d+\\.\\d+)\\b"
},
"detectionPath": {
"windows": "bin/arm-none-eabi-g++.exe",

2
src/plugins/mcusupport/test/armgcc_mimxrt1170_evk_freertos_json.h
View File

@@ -49,7 +49,7 @@ constexpr auto armgcc_mimxrt1170_evk_freertos_json = R"(
"versionDetection": {
"filePattern": "bin/arm-none-eabi-g++",
"executableArgs": "--version",
"regex": "\\bv(\\d+\\.\\d+\\.\\d+)\\b"
"regex": "\\b(\\d+\\.\\d+\\.\\d+)\\b"
},
"detectionPath": {
"windows": "bin/arm-none-eabi-g++.exe",

2
src/plugins/mcusupport/test/armgcc_stm32f469i_discovery_baremetal_json.h
View File

@@ -48,7 +48,7 @@ constexpr auto armgcc_stm32f469i_discovery_baremetal_json = R"(
"versionDetection": {
"filePattern": "bin/arm-none-eabi-g++",
"executableArgs": "--version",
"regex": "\\bv(\\d+\\.\\d+\\.\\d+)\\b"
"regex": "\\b(\\d+\\.\\d+\\.\\d+)\\b"
},
"detectionPath": {
"windows": "bin/arm-none-eabi-g++.exe",

2
src/plugins/mcusupport/test/armgcc_stm32f769i_discovery_baremetal_json.h
View File

@@ -48,7 +48,7 @@ constexpr auto armgcc_stm32f769i_discovery_baremetal_json = R"(
"versionDetection": {
"filePattern": "bin/arm-none-eabi-g++",
"executableArgs": "--version",
"regex": "\\bv(\\d+\\.\\d+\\.\\d+)\\b"
"regex": "\\b(\\d+\\.\\d+\\.\\d+)\\b"
},
"detectionPath": {
"windows": "bin/arm-none-eabi-g++.exe",

2
src/plugins/mcusupport/test/armgcc_stm32f769i_discovery_freertos_json.h
View File

@@ -48,7 +48,7 @@ constexpr auto armgcc_stm32f769i_discovery_freertos_json = R"(
"versionDetection": {
"filePattern": "bin/arm-none-eabi-g++",
"executableArgs": "--version",
"regex": "\\bv(\\d+\\.\\d+\\.\\d+)\\b"
"regex": "\\b(\\d+\\.\\d+\\.\\d+)\\b"
},
"detectionPath": {
"windows": "bin/arm-none-eabi-g++.exe",

2
src/plugins/mcusupport/test/armgcc_stm32h750b_discovery_baremetal_json.h
View File

@@ -48,7 +48,7 @@ constexpr auto armgcc_stm32h750b_discovery_baremetal_json = R"(
"versionDetection": {
"filePattern": "bin/arm-none-eabi-g++",
"executableArgs": "--version",
"regex": "\\bv(\\d+\\.\\d+\\.\\d+)\\b"
"regex": "\\b(\\d+\\.\\d+\\.\\d+)\\b"
},
"detectionPath": {
"windows": "bin/arm-none-eabi-g++.exe",

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

@@ -75,7 +75,7 @@ using testing::Return;
namespace {
const char empty[]{""};
const char armGcc[]{"armgcc"};
const char armGccVersionDetectionRegex[]{R"(\bv(\d+\.\d+\.\d+)\b)"};
const char armGccVersionDetectionRegex[]{R"(\b(\d+\.\d+\.\d+)\b)"};
const char armGccDir[]{"/opt/armgcc"};
const char armGccDirectorySetting[]{"GNUArmEmbeddedToolchain"};
const char armGccEnvVar[]{"ARMGCC_DIR"};
@@ -1648,7 +1648,7 @@ void McuSupportTest::test_nonemptyVersionDetector()
// pkgDesc.validationPath left empty
// pkgDesc.versions left empty
pkgDesc.versionDetection.filePattern = "bin/arm-none-eabi-g++";
pkgDesc.versionDetection.regex = "\\bv?(\\d+\\.\\d+\\.\\d+)\\b";
pkgDesc.versionDetection.regex = "\\b(\\d+\\.\\d+\\.\\d+)\\b";
pkgDesc.versionDetection.executableArgs = "--version";
// pkgDesc.versionDetection.xmlElement left empty
// pkgDesc.versionDetection.xmlAttribute left empty