Skip to content

Commit 6796025

Browse files
committed
Fixes for logs and test logic in tools
1 parent 71ffe89 commit 6796025

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

tools/build_api.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -521,8 +521,6 @@ def build_lib(lib_id, target, toolchain_name, options=None, verbose=False, clean
521521
if toolchain_output:
522522
cur_result["output"] += toolchain_output
523523

524-
cur_result["output"] += str(e)
525-
526524
add_result_to_report(report, cur_result)
527525

528526
# Let Exception propagate

tools/test.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import sys
2222
import os
2323
import json
24+
import fnmatch
2425

2526
ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
2627
sys.path.insert(0, ROOT)
@@ -105,8 +106,10 @@
105106

106107
all_tests_keys = all_tests.keys()
107108
for name in all_names:
108-
if name in all_tests_keys:
109-
tests[name] = all_tests[name]
109+
if any(fnmatch.fnmatch(testname, name) for testname in all_tests):
110+
for testname, test in all_tests.items():
111+
if fnmatch.fnmatch(testname, name):
112+
tests[testname] = test
110113
else:
111114
print "[Warning] Test with name '%s' was not found in the available tests" % (name)
112115
else:

tools/test_api.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2077,12 +2077,13 @@ def build_tests(tests, base_source_paths, build_path, target, toolchain_name,
20772077
verbose=verbose)
20782078

20792079
except Exception, e:
2080-
result = False
2081-
2082-
if continue_on_build_fail:
2083-
continue
2084-
else:
2085-
break
2080+
if not isinstance(e, NotSupportedException):
2081+
result = False
2082+
2083+
if continue_on_build_fail:
2084+
continue
2085+
else:
2086+
break
20862087

20872088
# If a clean build was carried out last time, disable it for the next build.
20882089
# Otherwise the previously built test will be deleted.

0 commit comments

Comments
 (0)