ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #7367 from theotherjimmy/check-arm-component 

Tools: Detect Arm Compiler version using Component
pull/7411/head
Cruz Monrreal 2018-07-03 07:35:57 -05:00 committed by GitHub
parent 226e799d5b ed04c1b413
commit 9c4c630356
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/test/toolchains/api_test.py
View File

@ -31,6 +31,13 @@ def test_arm_version_check(_run_cmd):
toolchain.version_check() toolchain.version_check()
assert notifier.messages == [] assert notifier.messages == []
_run_cmd.return_value = (""" _run_cmd.return_value = ("""
Product: MDK Professional 5.22
Component: ARM Compiler 5.06 update 5 (build 528)
Tool: armcc [4d3621]
""", "", 0)
toolchain.version_check()
assert notifier.messages == []
_run_cmd.return_value = ("""
Product: ARM Compiler Product: ARM Compiler
Component: ARM Compiler Component: ARM Compiler
Tool: armcc [4d3621] Tool: armcc [4d3621]

2
tools/toolchains/arm.py
View File

@ -41,7 +41,7 @@ class ARM(mbedToolchain):
SUPPORTED_CORES = ["Cortex-M0", "Cortex-M0+", "Cortex-M3", "Cortex-M4", SUPPORTED_CORES = ["Cortex-M0", "Cortex-M0+", "Cortex-M3", "Cortex-M4",
"Cortex-M4F", "Cortex-M7", "Cortex-M7F", "Cortex-M7FD", "Cortex-A9"] "Cortex-M4F", "Cortex-M7", "Cortex-M7F", "Cortex-M7FD", "Cortex-A9"]
ARMCC_RANGE = (LooseVersion("5.06"), LooseVersion("5.07")) ARMCC_RANGE = (LooseVersion("5.06"), LooseVersion("5.07"))
ARMCC_VERSION_RE = re.compile("Product: ARM Compiler (\d+\.\d+)") ARMCC_VERSION_RE = re.compile("Component: ARM Compiler (\d+\.\d+)")
@staticmethod @staticmethod
def check_executable(): def check_executable():