From dee8e7f0eaa35abe96e6560194b0d0a88a19a992 Mon Sep 17 00:00:00 2001 From: Sarah Marsh Date: Fri, 21 Jul 2017 16:09:15 -0500 Subject: [PATCH] Use default mbed-os test configuration if no app_config is supplied --- tools/test.py | 3 +++ tools/test_configs/__init__.py | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/tools/test.py b/tools/test.py index 1434329cfe..81b0c1b2c8 100644 --- a/tools/test.py +++ b/tools/test.py @@ -28,6 +28,7 @@ sys.path.insert(0, ROOT) 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 +from tools.test_configs import 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 print_build_memory_usage @@ -145,6 +146,8 @@ if __name__ == '__main__': config, module_conf = get_test_config(options.test_config, mcu) if not config: args_error(parser, "argument --test-config contains invalid path or identifier") + elif not options.app_config: + config = TestConfig.get_default_config(mcu) else: config = options.app_config diff --git a/tools/test_configs/__init__.py b/tools/test_configs/__init__.py index 86de0e3744..07e0a170fa 100644 --- a/tools/test_configs/__init__.py +++ b/tools/test_configs/__init__.py @@ -23,3 +23,12 @@ class TestConfig: return join(cls.CONFIG_DIR, configs[conf_name.upper()]) else: return None + + @classmethod + def get_default_config(cls, target_name): + configs = cls.get_valid_configs(target_name) + if configs: + keys = configs.keys() + return join(cls.CONFIG_DIR, configs[keys[0]]) + else: + return None