ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add app config switch to options.py and make.py

pull/2714/head
Conor Keegan 2016-09-01 11:41:19 +01:00 committed by Anna Bridge
parent 9d368098e5
commit 9c05d88349
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/make.py
View File

@ -52,7 +52,7 @@ from tools.settings import CLI_COLOR_MAP
if __name__ == '__main__': if __name__ == '__main__':
# Parse Options # Parse Options
parser = get_default_options_parser() parser = get_default_options_parser(add_app_config=True)
group = parser.add_mutually_exclusive_group(required=False) group = parser.add_mutually_exclusive_group(required=False)
group.add_argument("-p", group.add_argument("-p",
type=argparse_many(test_known), type=argparse_many(test_known),
@ -274,7 +274,8 @@ if __name__ == '__main__':
silent=options.silent, silent=options.silent,
macros=options.macros, macros=options.macros,
jobs=options.jobs, jobs=options.jobs,
name=options.artifact_name) name=options.artifact_name,
app_config=options.app_config)
print 'Image: %s'% bin_file print 'Image: %s'% bin_file
if options.disk: if options.disk:

11
tools/options.py
View File

@ -18,9 +18,11 @@ from argparse import ArgumentParser
from tools.toolchains import TOOLCHAINS from tools.toolchains import TOOLCHAINS
from tools.targets import TARGET_NAMES from tools.targets import TARGET_NAMES
from tools.utils import argparse_force_uppercase_type, \ from tools.utils import argparse_force_uppercase_type, \
argparse_lowercase_hyphen_type, argparse_many argparse_lowercase_hyphen_type, argparse_many, \
argparse_filestring_type
def get_default_options_parser(add_clean=True, add_options=True): def get_default_options_parser(add_clean=True, add_options=True,
add_app_config=False):
"""Create a new options parser with the default compiler options added """Create a new options parser with the default compiler options added
Keyword arguments: Keyword arguments:
@ -78,4 +80,9 @@ def get_default_options_parser(add_clean=True, add_options=True):
'analyze'], 'analyze'],
"build option")) "build option"))
if add_app_config:
parser.add_argument("--app-config", default=None, dest="app_config",
type=argparse_filestring_type,
help="Path of an app configuration file (Default is to look for 'mbed_app.json')")
return parser return parser

6
tools/test.py
View File

@ -41,7 +41,7 @@ from tools.settings import CLI_COLOR_MAP
if __name__ == '__main__': if __name__ == '__main__':
try: try:
# Parse Options # Parse Options
parser = get_default_options_parser() parser = get_default_options_parser(add_app_config=True)
parser.add_argument("-D", parser.add_argument("-D",
action="append", action="append",
@ -94,10 +94,6 @@ if __name__ == '__main__':
default=False, default=False,
help="Verbose diagnostic output") help="Verbose diagnostic output")
parser.add_argument("--app-config", default=None, dest="app_config",
type=argparse_filestring_type,
help="Path of an app configuration file (Default is to look for 'mbed_app.json')")
options = parser.parse_args() options = parser.parse_args()
# Filter tests by path if specified # Filter tests by path if specified