Skip to content

Commit 5eb4894

Browse files
author
Brian Daniels
committed
Added skipped mbed library build reporting and removed unnecessary print
1 parent afb331d commit 5eb4894

File tree

4 files changed

+28
-7
lines changed

4 files changed

+28
-7
lines changed

workspace_tools/build_release.py

+16-4
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@
108108
start = time()
109109
failures = []
110110
successes = []
111+
skips = []
111112
build_report = []
112113
for target_name, toolchain_list in OFFICIAL_MBED_LIBRARY_BUILD:
113114
if options.official_only:
@@ -121,14 +122,21 @@
121122
toolchains = toolchainSet and set((options.toolchains).split(','))
122123

123124

124-
cur_target_build_report = { "target": target_name, "passing": [], "failing": []}
125+
cur_target_build_report = { "target": target_name, "passing": [], "failing": [], "skipped": []}
125126

126127
for toolchain in toolchains:
127128
id = "%s::%s" % (target_name, toolchain)
128129
try:
129-
build_mbed_libs(TARGET_MAP[target_name], toolchain, verbose=options.verbose, jobs=options.jobs)
130-
successes.append(id)
131-
cur_target_build_report["passing"].append({ "toolchain": toolchain })
130+
built_mbed_lib = build_mbed_libs(TARGET_MAP[target_name], toolchain, verbose=options.verbose, jobs=options.jobs)
131+
132+
if built_mbed_lib:
133+
successes.append(id)
134+
cur_target_build_report["passing"].append({ "toolchain": toolchain })
135+
else:
136+
skips.append(id)
137+
cur_target_build_report["skipped"].append({ "toolchain": toolchain })
138+
139+
132140
except Exception, e:
133141
failures.append(id)
134142
cur_target_build_report["failing"].append({ "toolchain": toolchain })
@@ -148,6 +156,10 @@
148156
print "\n\nBuild successes:"
149157
print "\n".join([" * %s" % s for s in successes])
150158

159+
if skips:
160+
print "\n\nBuild skips:"
161+
print "\n".join([" * %s" % s for s in skips])
162+
151163
if failures:
152164
print "\n\nBuild failures:"
153165
print "\n".join([" * %s" % f for f in failures])

workspace_tools/ci_templates/library_build/build_report.html

+6-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ <h3>
88
<span class="greenbold">[PASS]</span>
99
{% endif %}
1010

11-
{{report.target}} - Passing: {{report.passing|length}}, Failing: {{report.failing|length}}
11+
{{report.target}} - Passing: {{report.passing|length}}, Failing: {{report.failing|length}}, Skipped: {{report.skipped|length}}
1212
</a>
1313
</h3>
1414

@@ -22,5 +22,10 @@ <h4 class="greenbold">Passing</h4>
2222
{% with build = report.passing %}
2323
{% include 'library_build/build_report_table.html' %}
2424
{% endwith %}
25+
26+
<h4>Skipped</h4>
27+
{% with build = report.skipped %}
28+
{% include 'library_build/build_report_table.html' %}
29+
{% endwith %}
2530
</div>
2631
</div>

workspace_tools/ci_templates/tests_build/build_report.html

+6-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ <h3>
88
<span class="greenbold">[PASS]</span>
99
{% endif %}
1010

11-
{{report.target}} - Passing: {{report.passing|length}}, Failing: {{report.failing|length}}
11+
{{report.target}} - Passing: {{report.passing|length}}, Failing: {{report.failing|length}}, Skipped: {{report.skipped|length}}
1212
</a>
1313
</h3>
1414

@@ -22,5 +22,10 @@ <h4 class="greenbold">Passing</h4>
2222
{% with build = report.passing %}
2323
{% include 'tests_build/build_report_table.html' %}
2424
{% endwith %}
25+
26+
<h4>Skipped</h4>
27+
{% with build = report.skipped %}
28+
{% include 'tests_build/build_report_table.html' %}
29+
{% endwith %}
2530
</div>
2631
</div>

workspace_tools/test_api.py

-1
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,6 @@ def execute_thread_slice(self, q, target, toolchains, clean, test_ids, build_rep
455455

456456
except ToolException:
457457
project_name_str = project_name if project_name is not None else test_id
458-
print "DIS BE MAH ERRRRR: %s" % (str(ToolException))
459458
print self.logger.log_line(self.logger.LogType.ERROR, 'There were errors while building project %s'% (project_name_str))
460459
build_report[toolchain]["test_build_failing"].append(test_id)
461460
# return self.test_summary, self.shuffle_random_seed, self.test_summary_ext, self.test_suite_properties_ext

0 commit comments

Comments
 (0)