Merge pull request #8181 from OPpuolitaival/py3_support

Py3 support
pull/8208/head
Cruz Monrreal 2018-09-20 18:13:44 -05:00 committed by GitHub
commit 8f7c0ae18d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions

View File

@ -1357,4 +1357,4 @@ def merge_build_data(filename, toolchain_report, app_type):
if 'type' not in build[0]:
build[0]['type'] = app_type
build_data['builds'].insert(0, build[0])
dump(build_data, open(filename, "wb"), indent=4, separators=(',', ': '))
dump(build_data, open(filename, "w"), indent=4, separators=(',', ': '))

View File

@ -166,15 +166,18 @@ def get_application_list(icetea_json_output, tests_by_name):
def icetea_tests(target, tcdir, verbose):
if not os.path.exists(tcdir):
raise Exception("Icetea run error: No TEST_APPS folder in {}".format(os.path.curdir))
command = ['icetea', '--tcdir', tcdir, '--list', '--json', '--platform_filter', target] \
+ (['-v'] if verbose else [])
stdout, stderr, returncode = run_cmd(command)
if returncode != 0:
raise Exception(
"Error when running icetea. \ncwd:{} \nCommand:'{}' \noutput:{}".format(os.getcwd(), ' '.join(command),
stderr.decode()))
additional_information = "\ncwd:{} \nCommand:'{}' \noutput:{}".format(os.getcwd(), ' '.join(command),
stderr.decode())
raise Exception("Error when running icetea. {}".format(additional_information))
return json.loads(stdout)