Skip to content

tools/toolhains - Test for flag passing in constructor #5182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 29, 2017
Merged

tools/toolhains - Test for flag passing in constructor #5182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef6de7e
Check for flag passing in toolchain constructor
theotherjimmy Sep 22, 2017
b9b4bb5
Move IAR flag passing to constructor
theotherjimmy Sep 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 54 additions & 5 deletions tools/test/toolchains/api_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
sys.path.insert(0, ROOT)

from tools.toolchains import TOOLCHAIN_CLASSES, LEGACY_TOOLCHAIN_NAMES,\
Resources, TOOLCHAIN_PATHS
Resources, TOOLCHAIN_PATHS, mbedToolchain
from tools.targets import TARGET_MAP

def test_instantiation():
Expand Down Expand Up @@ -43,11 +43,15 @@ def test_toolchain_profile_c(profile, source_file):
toolchain.inc_md5 = ""
toolchain.build_dir = ""
toolchain.config = MagicMock(app_config_location=None)
for parameter in profile['c'] + profile['common']:
assert any(parameter in cmd for cmd in toolchain.cc), \
"Toolchain %s did not propagate arg %s" % (toolchain.name,
parameter)
compile_command = toolchain.compile_command(to_compile,
to_compile + ".o", [])
for parameter in profile['c'] + profile['common']:
assert any(parameter in cmd for cmd in compile_command), \
"Toolchain %s did not propigate arg %s" % (toolchain.name,
"Toolchain %s did not propagate arg %s" % (toolchain.name,
parameter)

@given(fixed_dictionaries({
Expand All @@ -69,11 +73,15 @@ def test_toolchain_profile_cpp(profile, source_file):
toolchain.inc_md5 = ""
toolchain.build_dir = ""
toolchain.config = MagicMock(app_config_location=None)
for parameter in profile['cxx'] + profile['common']:
assert any(parameter in cmd for cmd in toolchain.cppc), \
"Toolchain %s did not propagate arg %s" % (toolchain.name,
parameter)
compile_command = toolchain.compile_command(to_compile,
to_compile + ".o", [])
for parameter in profile['cxx'] + profile['common']:
assert any(parameter in cmd for cmd in compile_command), \
"Toolchain %s did not propigate arg %s" % (toolchain.name,
"Toolchain %s did not propagate arg %s" % (toolchain.name,
parameter)

@given(fixed_dictionaries({
Expand All @@ -94,14 +102,55 @@ def test_toolchain_profile_asm(profile, source_file):
toolchain = tc_class(TARGET_MAP["K64F"], build_profile=profile)
toolchain.inc_md5 = ""
toolchain.build_dir = ""
for parameter in profile['asm']:
assert any(parameter in cmd for cmd in toolchain.asm), \
"Toolchain %s did not propagate arg %s" % (toolchain.name,
parameter)
compile_command = toolchain.compile_command(to_compile,
to_compile + ".o", [])
if not compile_command:
assert compile_command, to_compile
for parameter in profile['asm']:
assert any(parameter in cmd for cmd in compile_command), \
"Toolchain %s did not propigate arg %s" % (toolchain.name,
parameter)
"Toolchain %s did not propagate arg %s" % (toolchain.name,
parameter)

for name, Class in TOOLCHAIN_CLASSES.items():
CLS = Class(TARGET_MAP["K64F"])
assert name == CLS.name or name == LEGACY_TOOLCHAIN_NAMES[CLS.name]

@given(fixed_dictionaries({
'common': lists(text()),
'c': lists(text()),
'cxx': lists(text()),
'asm': lists(text()),
'ld': lists(text(min_size=1))}),
lists(text(min_size=1, alphabet=ALPHABET), min_size=1))
def test_toolchain_profile_ld(profile, source_file):
"""Test that the appropriate profile parameters are passed to the
Linker"""
filename = deepcopy(source_file)
filename[-1] += ".o"
to_compile = os.path.join(*filename)
with patch('os.mkdir') as _mkdir,\
patch('tools.toolchains.mbedToolchain.default_cmd') as _dflt_cmd:
for _, tc_class in TOOLCHAIN_CLASSES.items():
toolchain = tc_class(TARGET_MAP["K64F"], build_profile=profile)
toolchain.RESPONSE_FILES = False
toolchain.inc_md5 = ""
toolchain.build_dir = ""
for parameter in profile['ld']:
assert any(parameter in cmd for cmd in toolchain.ld), \
"Toolchain %s did not propagate arg %s" % (toolchain.name,
parameter)
toolchain.link(to_compile + ".elf", [to_compile], [], [], None)
compile_cmd = _dflt_cmd.call_args_list
if not compile_cmd:
assert compile_cmd, to_compile
for parameter in profile['ld']:
assert any(parameter in cmd[0][0] for cmd in compile_cmd), \
"Toolchain %s did not propagate arg %s" % (toolchain.name,
parameter)

for name, Class in TOOLCHAIN_CLASSES.items():
CLS = Class(TARGET_MAP["K64F"])
Expand Down
4 changes: 2 additions & 2 deletions tools/toolchains/iar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def __init__(self, target, notify=None, macros=None,
self.cc += self.flags["common"] + c_flags_cmd + self.flags["c"]
self.cppc += self.flags["common"] + c_flags_cmd + cxx_flags_cmd + self.flags["cxx"]

self.ld = [join(IAR_BIN, "ilinkarm")]
self.ld = [join(IAR_BIN, "ilinkarm")] + self.flags['ld']
self.ar = join(IAR_BIN, "iarchive")
self.elf2bin = join(IAR_BIN, "ielftool")

Expand Down Expand Up @@ -186,7 +186,7 @@ def compile_cpp(self, source, object, includes):
def link(self, output, objects, libraries, lib_dirs, mem_map):
# Build linker command
map_file = splitext(output)[0] + ".map"
cmd = self.ld + [ "-o", output, "--map=%s" % map_file] + objects + libraries + self.flags['ld']
cmd = self.ld + [ "-o", output, "--map=%s" % map_file] + objects + libraries

if mem_map:
cmd.extend(["--config", mem_map])
Expand Down