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

Tools: Detect Arm Compiler version using Component

Author: Cruz Monrreal

tools/test/toolchains/api_test.py

@@ -31,6 +31,13 @@ def test_arm_version_check(_run_cmd):
     toolchain.version_check()
     assert notifier.messages == []
     _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
     Component: ARM Compiler
     Tool: armcc [4d3621]

tools/toolchains/arm.py

@@ -41,7 +41,7 @@ class ARM(mbedToolchain):
     SUPPORTED_CORES = ["Cortex-M0", "Cortex-M0+", "Cortex-M3", "Cortex-M4",
                        "Cortex-M4F", "Cortex-M7", "Cortex-M7F", "Cortex-M7FD", "Cortex-A9"]
     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
     def check_executable():