Merge pull request #8181 from OPpuolitaival/py3_support

Py3 support
ARMmbed · Sep 20, 2018 · 8f7c0ae · 8f7c0ae
2 parents c005ba2 + 822fd37
commit 8f7c0ae
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/tools/build_api.py b/tools/build_api.py
@@ -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=(',', ': '))
diff --git a/tools/run_icetea.py b/tools/run_icetea.py
@@ -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)