Skip to content

Commit 830e9e0

Browse files
author
Jenny Plunkett
committed
Added options source_dir to get_default_config
1 parent d438324 commit 830e9e0

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

tools/test.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
from tools.test_api import test_path_to_name, find_tests, get_test_config, print_tests, build_tests, test_spec_from_test_builds
3131
import tools.test_configs as TestConfig
3232
from tools.options import get_default_options_parser, extract_profile, extract_mcus
33-
from tools.build_api import build_project, build_library
33+
from tools.build_api import build_project, build_library, get_config
3434
from tools.build_api import print_build_memory_usage
3535
from tools.build_api import merge_build_data
3636
from tools.targets import TARGET_MAP
@@ -142,11 +142,9 @@
142142
if options.test_config:
143143
config = get_test_config(options.test_config, mcu)
144144
if not config:
145-
args_error(parser, "argument --test-config contains invalid path or identifier")
145+
args_error(parser, "argument --test-csonfig contains invalid path or identifier")
146146
elif not options.app_config:
147-
config = TestConfig.get_default_config(mcu)
148-
if os.path.exists(os.path.abspath(os.path.join("mbed_app.json", ".."))):
149-
config = "mbed_app.json"
147+
config = TestConfig.get_default_config(options.source_dir, mcu)
150148
else:
151149
config = options.app_config
152150

0 commit comments

Comments
 (0)