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

Bugfixing for UT library support

pull/392/head
Przemek Wirkus 2014-07-08 14:29:49 +01:00
parent ee1a2f5289
commit 79970295ea
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
workspace_tools/singletest.py
View File

@ -666,12 +666,6 @@ if __name__ == '__main__':
default=False,
help="Only build tests, skips actual test procedures (flashing etc.)")
parser.add_option("", "--cpputest",
action="store_true",
dest="use_cpputest_library",
default=False,
help="Use cpputest library to run UT on target devices")
parser.add_option('-v', '--verbose',
dest='verbose',
default=False,
@ -754,7 +748,8 @@ if __name__ == '__main__':
if test.automated and test.is_supported(target, toolchain):
if not is_peripherals_available(target, test.peripherals):
if opts.verbose:
print "TargetTest::%s::TestSkipped(%s)" % (target, ",".join(test.peripherals))
test_peripherals = test.peripherals if test.peripherals else []
print "TargetTest::%s::TestSkipped(%s)" % (target, ",".join(test_peripherals))
continue
test_result = {
@ -779,12 +774,12 @@ if __name__ == '__main__':
# TODO: move this 2 below loops to separate function
INC_DIRS = []
for lib_id in libraries:
if LIBRARY_MAP[lib_id]['inc_dirs_ext']:
if 'inc_dirs_ext' in LIBRARY_MAP[lib_id] and LIBRARY_MAP[lib_id]['inc_dirs_ext']:
INC_DIRS.extend(LIBRARY_MAP[lib_id]['inc_dirs_ext'])
MACROS = []
for lib_id in libraries:
if LIBRARY_MAP[lib_id]['macros']:
if 'macros' in LIBRARY_MAP[lib_id] and LIBRARY_MAP[lib_id]['macros']:
MACROS.extend(LIBRARY_MAP[lib_id]['macros'])
path = build_project(test.source_dir, join(build_dir, test_id),