Skip to content

Commit 8f7c0ae

Browse files
author
Cruz Monrreal
authored
Merge pull request #8181 from OPpuolitaival/py3_support
Py3 support
2 parents c005ba2 + 822fd37 commit 8f7c0ae

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

tools/build_api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1357,4 +1357,4 @@ def merge_build_data(filename, toolchain_report, app_type):
13571357
if 'type' not in build[0]:
13581358
build[0]['type'] = app_type
13591359
build_data['builds'].insert(0, build[0])
1360-
dump(build_data, open(filename, "wb"), indent=4, separators=(',', ': '))
1360+
dump(build_data, open(filename, "w"), indent=4, separators=(',', ': '))

tools/run_icetea.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,15 +166,18 @@ def get_application_list(icetea_json_output, tests_by_name):
166166

167167

168168
def icetea_tests(target, tcdir, verbose):
169+
if not os.path.exists(tcdir):
170+
raise Exception("Icetea run error: No TEST_APPS folder in {}".format(os.path.curdir))
171+
169172
command = ['icetea', '--tcdir', tcdir, '--list', '--json', '--platform_filter', target] \
170173
+ (['-v'] if verbose else [])
171174

172175
stdout, stderr, returncode = run_cmd(command)
173176

174177
if returncode != 0:
175-
raise Exception(
176-
"Error when running icetea. \ncwd:{} \nCommand:'{}' \noutput:{}".format(os.getcwd(), ' '.join(command),
177-
stderr.decode()))
178+
additional_information = "\ncwd:{} \nCommand:'{}' \noutput:{}".format(os.getcwd(), ' '.join(command),
179+
stderr.decode())
180+
raise Exception("Error when running icetea. {}".format(additional_information))
178181

179182
return json.loads(stdout)
180183

0 commit comments

Comments
 (0)