Skip to content

Feature: Macros handling to mbed test #835

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 4 commits into from
Feb 7, 2019
Merged

Feature: Macros handling to mbed test #835

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1f73607
Add support for macros handling to `mbed test`
screamerbg Feb 1, 2019
7871c06
Fix python errors
screamerbg Feb 1, 2019
d5eda52
Thanks
theotherjimmy Feb 1, 2019
41d954b
Extend macros with those found in MACROS.txt
theotherjimmy Feb 7, 2019
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
26 changes: 14 additions & 12 deletions mbed/mbed.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1760,11 +1760,12 @@ def set_defaults(self, target=None, toolchain=None):
if toolchain and not self.get_cfg('TOOLCHAIN'):
self.set_cfg('TOOLCHAIN', toolchain)

def get_macros(self):
macros = []
def get_macros(self, more_macros=None):
macros = more_macros or []
Copy link
Contributor

@bridadan bridadan Feb 1, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

EDIT: oh dear, this is a bad idea, please ignore. Thanks @theotherjimmy

nitpick/simplification: You can simplify this block by altering the function:

    def get_macros(self, macros=[]):

This allows you to remove this line

Suggested change
macros = more_macros or []

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bridadan please don't suggest this. https://docs.python-guide.org/writing/gotchas/#mutable-default-arguments

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That being said, please change False to None, as it's the pythonic "value is missing" value.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yikes, thanks for the heads up. I learned something today.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bridadan see Jimmy's comment and also the extra commit. I had it before the way you suggested :)

# backwards compatibility with old MACROS.txt file
if os.path.isfile('MACROS.txt'):
with open('MACROS.txt') as f:
macros = f.read().splitlines()
macros.extend(f.read().splitlines())
return macros


Expand Down Expand Up @@ -2613,6 +2614,7 @@ def _safe_append_profile_to_build_path(build_path, profile):
@subcommand('compile',
dict(name=['-t', '--toolchain'], help='Compile toolchain. Example: ARM, GCC_ARM, IAR'),
dict(name=['-m', '--target'], help='Compile target MCU. Example: K64F, NUCLEO_F401RE, NRF51822...'),
dict(name=['-D', '--macro'], action='append', help='Add a macro definition'),
dict(name=['--profile'], action='append', help='Path of a build profile configuration file (or name of Mbed OS profile). Default: develop'),
dict(name='--library', dest='compile_library', action='store_true', help='Compile the current program or library as a static library.'),
dict(name='--config', dest='compile_config', action='store_true', help='Show run-time compile configuration'),
Expand All @@ -2627,7 +2629,10 @@ def _safe_append_profile_to_build_path(build_path, profile):
dict(name='--app-config', dest="app_config", help="Path of an application configuration file. Default is to look for \"mbed_app.json\"."),
help='Compile code using the mbed build tools',
description="Compile this program using the mbed build tools.")
def compile_(toolchain=None, target=None, profile=False, compile_library=False, compile_config=False, config_prefix=None, source=False, build=False, clean=False, flash=False, sterm=False, artifact_name=None, supported=False, app_config=None):
def compile_(toolchain=None, target=None, macro=False, profile=False,
compile_library=False, compile_config=False, config_prefix=None,
source=False, build=False, clean=False, flash=False, sterm=False,
artifact_name=None, supported=False, app_config=None):
# Gather remaining arguments
args = remainder
# Find the root of the program
Expand Down Expand Up @@ -2656,7 +2661,7 @@ def compile_(toolchain=None, target=None, profile=False, compile_library=False,

target = program.get_target(target)
tchain = program.get_toolchain(toolchain)
macros = program.get_macros()
macros = program.get_macros(macro)
profile = program.get_profile(profile)

if compile_config:
Expand Down Expand Up @@ -2750,6 +2755,7 @@ def compile_(toolchain=None, target=None, profile=False, compile_library=False,
@subcommand('test',
dict(name=['-t', '--toolchain'], help='Compile toolchain. Example: ARM, GCC_ARM, IAR'),
dict(name=['-m', '--target'], help='Compile target MCU. Example: K64F, NUCLEO_F401RE, NRF51822...'),
dict(name=['-D', '--macro'], action='append', help='Add a macro definition'),
dict(name='--compile-list', dest='compile_list', action='store_true',
help='List all tests that can be built'),
dict(name='--run-list', dest='run_list', action='store_true', help='List all built tests that can be ran'),
Expand Down Expand Up @@ -2777,12 +2783,7 @@ def compile_(toolchain=None, target=None, profile=False, compile_library=False,
help="Run Icetea tests. If used without --greentea flag then run only icetea tests."),
help='Find, build and run tests',
description="Find, build, and run tests in a program and libraries")
def test_(toolchain=None, target=None, compile_list=False, run_list=False,
compile_only=False, run_only=False, tests_by_name=None, source=False,
profile=False, build=False, clean=False, test_spec=None,
app_config=None, test_config=None, coverage=None, make_program=None,
new=None, generator=None, regex=None, unittests=None,
build_data=None, greentea=None, icetea=None):
def test_(toolchain=None, target=None, macro=False, compile_list=False, run_list=False, compile_only=False, run_only=False, tests_by_name=None, source=False, profile=False, build=False, clean=False, test_spec=None, app_config=None, test_config=None, coverage=None, make_program=None, new=None, generator=None, regex=None, unittests=None, build_data=None, greentea=None, icetea=None):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
def test_(toolchain=None, target=None, macro=False, compile_list=False, run_list=False, compile_only=False, run_only=False, tests_by_name=None, source=False, profile=False, build=False, clean=False, test_spec=None, app_config=None, test_config=None, coverage=None, make_program=None, new=None, generator=None, regex=None, unittests=None, build_data=None, greentea=None, icetea=None):
def test_(toolchain=None, target=None, macro=False, compile_list=False,
run_list=False, compile_only=False, run_only=False, tests_by_name=None,
source=False, profile=False, build=False, clean=False, test_spec=None,
app_config=None, test_config=None, coverage=None,
make_program=None, new=None, generator=None, regex=None,
unittests=None, build_data=None, greentea=None, icetea=None):


# Default behaviour is to run only greentea tests
if not (greentea or icetea or unittests):
Expand All @@ -2808,7 +2809,8 @@ def test_(toolchain=None, target=None, compile_list=False, run_list=False,
orig_path = getcwd()
orig_target = target

macros = program.get_macros()
macros = program.get_macros(macro)
macros.append("MBED_TEST_MODE")
tools_dir = program.get_tools()
build_and_run_tests = not compile_list and not run_list and not compile_only and not run_only

Expand Down