Skip to content

Commit 1adf494

Browse files
committed
Merge pull request ARMmbed#1441 from bridadan/handle-skipped-builds
Handle Skipped Builds in Upload Script
2 parents 2b2e0d5 + 37dfb73 commit 1adf494

File tree

1 file changed

+28
-25
lines changed

1 file changed

+28
-25
lines changed

workspace_tools/upload_results.py

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -222,31 +222,34 @@ def add_report(project_run_data, report_file, is_build, build_id, host_os):
222222

223223
project_run_data['names_set'].add(projectRun['project'])
224224

225-
system_outs = test_case.findall('system-out')
226-
227-
output = ""
228-
if system_outs:
229-
output = system_outs[0].text
230-
231-
if is_build:
232-
projectRun['buildOutput'] = output
233-
else:
234-
projectRun['testOutput'] = output
235-
236-
errors = test_case.findall('error')
237-
failures = test_case.findall('failure')
238-
239-
if errors:
240-
projectRun['pass'] = False
241-
projectRun['result'] = errors[0].attrib['message']
242-
elif failures:
243-
projectRun['pass'] = False
244-
projectRun['result'] = failures[0].attrib['message']
245-
else:
246-
projectRun['pass'] = True
247-
projectRun['result'] = 'OK'
248-
249-
update_project_run(project_run_data['projectRuns'], projectRun)
225+
skipped = test_case.findall('skipped')
226+
227+
if not skipped:
228+
system_outs = test_case.findall('system-out')
229+
230+
output = ""
231+
if system_outs:
232+
output = system_outs[0].text
233+
234+
if is_build:
235+
projectRun['buildOutput'] = output
236+
else:
237+
projectRun['testOutput'] = output
238+
239+
errors = test_case.findall('error')
240+
failures = test_case.findall('failure')
241+
242+
if errors:
243+
projectRun['pass'] = False
244+
projectRun['result'] = errors[0].attrib['message']
245+
elif failures:
246+
projectRun['pass'] = False
247+
projectRun['result'] = failures[0].attrib['message']
248+
else:
249+
projectRun['pass'] = True
250+
projectRun['result'] = 'OK'
251+
252+
update_project_run(project_run_data['projectRuns'], projectRun)
250253

251254
def main(arguments):
252255
# Register and parse command line arguments

0 commit comments

Comments
 (0)