Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/py3_ci_enable' into 'master'

Browse source 
Enable Python 3 bot tests in master

See merge request idf/esp-idf!3615
This commit is contained in:
Ivan Grokhotkov 2018-11-05 19:49:32 +08:00
commit e4b68c49f2
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/ci/setup_python.sh
View file

@ -1,7 +1,9 @@
#! /bin/bash
# Regexp for matching job names which are incompatible with Python 3
py3_incomp='assign_test|UT|IT'
# - assign_test, nvs_compatible_test, IT - auto_test_script causes the incompatibility
# - UT_009_ - RS485 multi-device test is not started properly
py3_incomp='assign_test|nvs_compatible_test|IT|UT_009_'
if [ -z ${PYTHON_VER+x} ] || [[ $CI_JOB_NAME =~ $py3_incomp ]]; then
# Use this version of the Python interpreter if it was not defined before or

8
tools/unit-test-app/idf_ext.py
View file

@ -141,12 +141,12 @@ def add_action_extensions(base_functions, base_actions):
# config folder to build config
sdkconfig_default = os.path.join(PROJECT_PATH, "sdkconfig.defaults")
with open(sdkconfig_default, "r") as sdkconfig_default_file:
with open(sdkconfig_default, "rb") as sdkconfig_default_file:
sdkconfig_temp.write(sdkconfig_default_file.read())
sdkconfig_config = os.path.join(PROJECT_PATH, "configs", config_name)
with open(sdkconfig_config, "r") as sdkconfig_config_file:
sdkconfig_temp.write("\n")
with open(sdkconfig_config, "rb") as sdkconfig_config_file:
sdkconfig_temp.write(b"\n")
sdkconfig_temp.write(sdkconfig_config_file.read())
sdkconfig_temp.flush()
@ -276,4 +276,4 @@ idf.py ut-apply-config-NAME - Generates configuration based on configs/NAME in s
extensions["ut-help"] = (ut_help, [], [])
base_actions.update(extensions)
base_actions.update(extensions)