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

Merge pull request #85 from bridadan/build-tests-fix 

Fixing build issues for tests
Sam Grove 2016-05-10 09:31:29 -05:00
parent 904ea446eb 4ae7d54830
commit 9c38f2aa63
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/test.py
View File

@ -27,7 +27,7 @@ sys.path.insert(0, ROOT)
from tools.test_api import test_path_to_name, find_tests, print_tests, build_tests, test_spec_from_test_build from tools.test_api import test_path_to_name, find_tests, print_tests, build_tests, test_spec_from_test_build
from tools.options import get_default_options_parser from tools.options import get_default_options_parser
from tools.build_api import build_project from tools.build_api import build_project, build_library
from tools.targets import TARGET_MAP from tools.targets import TARGET_MAP
from tools.utils import mkdir from tools.utils import mkdir
@ -115,10 +115,17 @@ if __name__ == '__main__':
if not base_source_paths: if not base_source_paths:
base_source_paths = ['.'] base_source_paths = ['.']
target = TARGET_MAP[options.mcu] target = TARGET_MAP[options.mcu]
lib_build_res = build_library(base_source_paths, options.build_dir, target, options.tool,
options=options.options,
jobs=options.jobs,
clean=options.clean,
archive=False)
# Build all the tests # Build all the tests
test_build = build_tests(tests, base_source_paths, options.build_dir, target, options.tool, test_build = build_tests(tests, [options.build_dir], options.build_dir, target, options.tool,
options=options.options, options=options.options,
clean=options.clean, clean=options.clean,
jobs=options.jobs) jobs=options.jobs)

6
tools/test_api.py
View File

@ -2041,13 +2041,13 @@ def build_tests(tests, base_source_paths, build_path, target, toolchain_name,
} }
for test_name, test_path in tests.iteritems(): for test_name, test_path in tests.iteritems():
test_build_path = os.path.join(build_path, test_path)
src_path = base_source_paths + [test_path] src_path = base_source_paths + [test_path]
artifact_name = os.path.join(test_path, test_name) bin_file = build_project(src_path, test_build_path, target, toolchain_name,
bin_file = build_project(src_path, build_path, target, toolchain_name,
options=options, options=options,
jobs=jobs, jobs=jobs,
clean=clean, clean=clean,
name=artifact_name, name=test_name,
report=report, report=report,
properties=properties, properties=properties,
verbose=verbose) verbose=verbose)