Skip to content

Commit 24bb556

Browse files
committed
tools: Removed outdated (and broken) toolchain initialization test
Also moved the access of build_dir into condition on secure in ARMC6 per theotherjimmy
1 parent 5a10816 commit 24bb556

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

tools/test/toolchains/api_test.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,6 @@
1515
Resources, TOOLCHAIN_PATHS, mbedToolchain
1616
from tools.targets import TARGET_MAP
1717

18-
def test_instantiation():
19-
"""Test that all exported toolchain may be instantiated"""
20-
for name, tc_class in TOOLCHAIN_CLASSES.items():
21-
cls = tc_class(TARGET_MAP["K64F"])
22-
assert name == cls.name or\
23-
name == LEGACY_TOOLCHAIN_NAMES[cls.name]
24-
2518
ALPHABET = [char for char in printable if char not in [u'.', u'/']]
2619

2720
@given(fixed_dictionaries({

tools/toolchains/arm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,6 @@ def __init__(self, target, *args, **kwargs):
309309
raise NotSupportedException(
310310
"this compiler does not support the core %s" % target.core)
311311

312-
build_dir = kwargs['build_dir']
313312
if not set(("ARM", "ARMC6")).intersection(set(target.supported_toolchains)):
314313
raise NotSupportedException("ARM/ARMC6 compiler support is required for ARMC6 build")
315314

@@ -349,6 +348,7 @@ def __init__(self, target, *args, **kwargs):
349348

350349
# Create Secure library
351350
if target.core == "Cortex-M23" or self.target.core == "Cortex-M33":
351+
build_dir = kwargs['build_dir']
352352
secure_file = join(build_dir, "cmse_lib.o")
353353
self.flags["ld"] += ["--import_cmse_lib_out=%s" % secure_file]
354354

0 commit comments

Comments
 (0)