From 937bfa992c8c07efd8f9673e2f5e95eb321d7c65 Mon Sep 17 00:00:00 2001 From: Cruz Monrreal II Date: Fri, 1 Dec 2017 12:01:56 -0600 Subject: [PATCH 1/4] Fixed `mbed target -S` and `mbed toolchain -S` commands --- mbed/mbed.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mbed/mbed.py b/mbed/mbed.py index 5f459cb5..1002e06d 100644 --- a/mbed/mbed.py +++ b/mbed/mbed.py @@ -2218,7 +2218,7 @@ def compile_(toolchain=None, target=None, profile=False, compile_library=False, if supported: popen([python_cmd, '-u', os.path.join(tools_dir, 'make.py')] - + (['-S', supported] if supported else []) + (['-v'] if very_verbose else []) + + (['-S', supported]) + (['-v'] if very_verbose else []) + (['--app-config', app_config] if app_config else []) + args, env=env) @@ -2574,7 +2574,7 @@ def config_(var=None, value=None, global_cfg=False, unset=False, list_config=Fal "This is an alias to 'mbed config [--global] target [name]'\n")) def target_(name=None, global_cfg=False, supported=False): if supported: - return compile_(supported=supported) + return compile_(supported='matrix') return config_('target', name, global_cfg=global_cfg) @subcommand('toolchain', @@ -2587,7 +2587,7 @@ def target_(name=None, global_cfg=False, supported=False): "This is an alias to 'mbed config [--global] toolchain [name]'\n")) def toolchain_(name=None, global_cfg=False, supported=False): if supported: - return compile_(supported=supported) + return compile_(supported='matrix') return config_('toolchain', name, global_cfg=global_cfg) @subcommand('help', From c9720aaf44d0e744ec0f379e21be746abac63500 Mon Sep 17 00:00:00 2001 From: Cruz Monrreal II Date: Tue, 5 Dec 2017 17:38:57 -0600 Subject: [PATCH 2/4] Corrected behavior of `mbed -S`. Performed manual tests on mbed-os-5.x.0 repos. --- mbed/mbed.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mbed/mbed.py b/mbed/mbed.py index 1002e06d..4a1a812d 100644 --- a/mbed/mbed.py +++ b/mbed/mbed.py @@ -2194,7 +2194,7 @@ def status_(ignore=False): dict(name=['-c', '--clean'], action='store_true', help='Clean the build directory before compiling'), dict(name=['-f', '--flash'], action='store_true', help='Flash the built firmware onto a connected target.'), dict(name=['-N', '--artifact-name'], help='Name of the built program or library'), - dict(name=['-S', '--supported'], dest='supported', const="matrix", choices=["matrix", "toolchains", "targets"], nargs="?", help='Shows supported matrix of targets and toolchains'), + dict(name=['-S', '--supported'], dest='supported', const=True, choices=["matrix", "toolchains", "targets"], nargs="?", help='Shows supported matrix of targets and toolchains'), dict(name='--app-config', dest="app_config", help="Path of an app 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.")) @@ -2218,7 +2218,7 @@ def compile_(toolchain=None, target=None, profile=False, compile_library=False, if supported: popen([python_cmd, '-u', os.path.join(tools_dir, 'make.py')] - + (['-S', supported]) + (['-v'] if very_verbose else []) + + (['-S', supported] if (supported is not True) else ['-S']) + (['-v'] if very_verbose else []) + (['--app-config', app_config] if app_config else []) + args, env=env) @@ -2408,7 +2408,7 @@ def test_(toolchain=None, target=None, compile_list=False, run_list=False, compi dict(name=['-m', '--target'], help='Export for target MCU. Example: K64F, NUCLEO_F401RE, NRF51822...'), dict(name='--source', action='append', help='Source directory. Default: . (current dir)'), dict(name=['-c', '--clean'], action='store_true', help='Clean the build directory before compiling'), - dict(name=['-S', '--supported'], dest='supported', const="matrix", choices=["matrix", "ides"], nargs="?", help='Shows supported matrix of targets and toolchains'), + dict(name=['-S', '--supported'], dest='supported', const=True, choices=['matrix', 'ides'], nargs='?', help='Shows supported matrix of targets and toolchains'), dict(name='--app-config', dest="app_config", help="Path of an app configuration file (Default is to look for 'mbed_app.json')"), help='Generate an IDE project', description=( @@ -2430,7 +2430,7 @@ def export(ide=None, target=None, source=False, clean=False, supported=False, ap if supported: popen([python_cmd, '-u', os.path.join(tools_dir, 'project.py')] - + (['-S', supported] if supported else []) + (['-v'] if very_verbose else []), + + (['-S', supported] if (supported is not True) else ['-S']) + (['-v'] if very_verbose else []), env=env) return @@ -2574,7 +2574,7 @@ def config_(var=None, value=None, global_cfg=False, unset=False, list_config=Fal "This is an alias to 'mbed config [--global] target [name]'\n")) def target_(name=None, global_cfg=False, supported=False): if supported: - return compile_(supported='matrix') + return compile_(supported=supported) return config_('target', name, global_cfg=global_cfg) @subcommand('toolchain', @@ -2587,7 +2587,7 @@ def target_(name=None, global_cfg=False, supported=False): "This is an alias to 'mbed config [--global] toolchain [name]'\n")) def toolchain_(name=None, global_cfg=False, supported=False): if supported: - return compile_(supported='matrix') + return compile_(supported=supported) return config_('toolchain', name, global_cfg=global_cfg) @subcommand('help', From 09a8b040aba614ff1b5dbe045d5202d915e6a64a Mon Sep 17 00:00:00 2001 From: Cruz Monrreal II Date: Thu, 7 Dec 2017 14:55:44 -0600 Subject: [PATCH 3/4] Added CircleCI tests. --- circle.yml | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/circle.yml b/circle.yml index 7f54b407..7ec60c93 100644 --- a/circle.yml +++ b/circle.yml @@ -17,6 +17,56 @@ test: - cd .tests/bld-test/mbed && mbed update 85 --clean - cd .tests/bld-test && mbed update --clean - cd .tests/bld-test && mbed compile -m LPC1768 -j 0 + - cd .tests && mbed new supported-tests + - |- + cd .tests/supported-tests + echo "Testing mbed-os-5.6.0" + mbed update --clean "mbed-os-5.6.0" + mbed compile -S + mbed toolchain -S + mbed target -S + mbed export -S + - |- + cd .tests/supported-tests + echo "Testing mbed-os-5.5.0" + mbed update --clean "mbed-os-5.5.0" + mbed compile -S + mbed toolchain -S + mbed target -S + mbed export -S + - |- + cd .tests/supported-tests + echo "Testing mbed-os-5.4.0" + mbed update --clean "mbed-os-5.4.0" + mbed compile -S + mbed toolchain -S + mbed target -S + mbed export -S + - |- + cd .tests/supported-tests + echo "Testing mbed-os-5.3.0" + mbed update --clean "mbed-os-5.3.0" + mbed compile -S + mbed toolchain -S + mbed target -S + mbed export -S + - |- + cd .tests/supported-tests + echo "Testing mbed-os-5.2.0" + mbed update --clean "mbed-os-5.2.0" + mbed compile -S + mbed toolchain -S + mbed target -S + mbed export -S + - |- + cd .tests/supported-tests + echo "Testing mbed-os-5.1.0" + mbed update --clean "mbed-os-5.1.0" + mbed compile -S + mbed toolchain -S + mbed target -S + mbed export -S + dependencies: pre: From 167b263949b4b43ed2ed74f4a4cc0e362f4dd852 Mon Sep 17 00:00:00 2001 From: Cruz Monrreal II Date: Thu, 7 Dec 2017 15:37:03 -0600 Subject: [PATCH 4/4] Silly commit to retry CircleCI build with Ubuntu 12.04 LTS --- circle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/circle.yml b/circle.yml index 7ec60c93..b4bfa530 100644 --- a/circle.yml +++ b/circle.yml @@ -68,6 +68,7 @@ test: mbed export -S + dependencies: pre: - sudo pip install pytest