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

Added options source_dir to get_default_config

pull/5559/head
Jenny Plunkett 2017-12-01 14:54:35 -06:00
parent d438324d31
commit 830e9e0bcd
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/test.py
View File

@ -30,7 +30,7 @@ from tools.config import ConfigException
from tools.test_api import test_path_to_name, find_tests, get_test_config, print_tests, build_tests, test_spec_from_test_builds
import tools.test_configs as TestConfig
from tools.options import get_default_options_parser, extract_profile, extract_mcus
from tools.build_api import build_project, build_library
from tools.build_api import build_project, build_library, get_config
from tools.build_api import print_build_memory_usage
from tools.build_api import merge_build_data
from tools.targets import TARGET_MAP
@ -142,11 +142,9 @@ if __name__ == '__main__':
if options.test_config:
config = get_test_config(options.test_config, mcu)
if not config:
args_error(parser, "argument --test-config contains invalid path or identifier")
args_error(parser, "argument --test-csonfig contains invalid path or identifier")
elif not options.app_config:
config = TestConfig.get_default_config(mcu)
if os.path.exists(os.path.abspath(os.path.join("mbed_app.json", ".."))):
config = "mbed_app.json"
config = TestConfig.get_default_config(options.source_dir, mcu)
else:
config = options.app_config