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

Merge pull request #11243 from OPpuolitaival/py3 

Python3 fixes
pull/11260/head
Olli-Pekka Puolitaival 2019-08-19 10:47:31 +03:00 committed by GitHub
parent 033fffea84 ba26bd9cde
commit 1471d2248d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/test/examples/examples_lib.py
View File

@ -58,7 +58,7 @@ def print_list(lst):
def print_category(results, index, message): def print_category(results, index, message):
summary = [example for key, summ in results.items() summary = [example for key, summ in list(results.items())
for example in summ[index]] for example in summ[index]]
if all(len(s) == 0 for s in summary): if all(len(s) == 0 for s in summary):
return return
@ -256,7 +256,7 @@ def get_num_failures(results, export=False):
""" """
num_failures = 0 num_failures = 0
for key, val in results.items(): for key, val in list(results.items()):
num_failures = num_failures + len(val[3]) num_failures = num_failures + len(val[3])
if export: if export:
num_failures += len(val[4]) num_failures += len(val[4])
@ -384,7 +384,7 @@ def compile_repos(config, toolchains, targets, profile, verbose, examples):
successes = [] successes = []
compiled = True compiled = True
pass_status = True pass_status = True
if example.has_key('test') and example['test'] and example.has_key('baud_rate') and example.has_key('compare_log'): if 'test' in example and example['test'] and 'baud_rate' in example and 'compare_log'in example:
test_example = True test_example = True
else: else:
test_example = False test_example = False
@ -408,6 +408,7 @@ def compile_repos(config, toolchains, targets, profile, verbose, examples):
proc = subprocess.Popen(build_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE) proc = subprocess.Popen(build_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
std_out, std_err = proc.communicate() std_out, std_err = proc.communicate()
std_out = std_out.decode('utf-8')
print ("\n#### STDOUT ####\n%s\n#### STDERR ####\n%s\n#### End of STDOUT/STDERR ####\n" % (std_out,std_err)) print ("\n#### STDOUT ####\n%s\n#### STDERR ####\n%s\n#### End of STDOUT/STDERR ####\n" % (std_out,std_err))
if test_example: if test_example:
@ -427,7 +428,7 @@ def compile_repos(config, toolchains, targets, profile, verbose, examples):
if test_example: if test_example:
test_group = "{}-{}-{}".format(target, toolchain, example['baud_rate']) test_group = "{}-{}-{}".format(target, toolchain, example['baud_rate'])
if image: if image:
if not test_json['builds'].has_key(test_group): if not test_group in test_json['builds']:
test_json['builds'][test_group] = { test_json['builds'][test_group] = {
"platform":target , "platform":target ,
"toolchain": toolchain , "toolchain": toolchain ,