Fixes for logs and test logic in tools

pull/1925/head
Brian Daniels 2016-06-13 22:10:59 +01:00
parent 71ffe897b5
commit 6796025e78
3 changed files with 12 additions and 10 deletions

View File

@ -521,8 +521,6 @@ def build_lib(lib_id, target, toolchain_name, options=None, verbose=False, clean
if toolchain_output: if toolchain_output:
cur_result["output"] += toolchain_output cur_result["output"] += toolchain_output
cur_result["output"] += str(e)
add_result_to_report(report, cur_result) add_result_to_report(report, cur_result)
# Let Exception propagate # Let Exception propagate

View File

@ -21,6 +21,7 @@ TEST BUILD & RUN
import sys import sys
import os import os
import json import json
import fnmatch
ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), "..")) ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
sys.path.insert(0, ROOT) sys.path.insert(0, ROOT)
@ -105,8 +106,10 @@ if __name__ == '__main__':
all_tests_keys = all_tests.keys() all_tests_keys = all_tests.keys()
for name in all_names: for name in all_names:
if name in all_tests_keys: if any(fnmatch.fnmatch(testname, name) for testname in all_tests):
tests[name] = all_tests[name] for testname, test in all_tests.items():
if fnmatch.fnmatch(testname, name):
tests[testname] = test
else: else:
print "[Warning] Test with name '%s' was not found in the available tests" % (name) print "[Warning] Test with name '%s' was not found in the available tests" % (name)
else: else:

View File

@ -2077,12 +2077,13 @@ def build_tests(tests, base_source_paths, build_path, target, toolchain_name,
verbose=verbose) verbose=verbose)
except Exception, e: except Exception, e:
result = False if not isinstance(e, NotSupportedException):
result = False
if continue_on_build_fail: if continue_on_build_fail:
continue continue
else: else:
break break
# If a clean build was carried out last time, disable it for the next build. # If a clean build was carried out last time, disable it for the next build.
# Otherwise the previously built test will be deleted. # Otherwise the previously built test will be deleted.