diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2021-10-01 19:33:15 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2021-10-04 14:36:08 -0400 |
| commit | b743a646857f54342704b3115ba1ad474e21c158 (patch) | |
| tree | ca102aa1dd8525a7cb582d70f894d5bf6875fa6a /scripts | |
| parent | f1747b51182cbe4d77c991492b55fd2df12b4c18 (diff) | |
| download | kutter-b743a646857f54342704b3115ba1ad474e21c158.tar.gz kutter-b743a646857f54342704b3115ba1ad474e21c158.tar.xz kutter-b743a646857f54342704b3115ba1ad474e21c158.zip | |
scripts: Update klippy build tests to verify on both Python2 and Python3
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/ci-build.sh | 9 | ||||
| -rwxr-xr-x | scripts/ci-install.sh | 16 |
2 files changed, 20 insertions, 5 deletions
diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh index 5f626088..286e4490 100755 --- a/scripts/ci-build.sh +++ b/scripts/ci-build.sh @@ -9,6 +9,7 @@ MAIN_DIR=${PWD} BUILD_DIR=${PWD}/ci_build export PATH=${BUILD_DIR}/pru-gcc/bin:${PATH} PYTHON=${BUILD_DIR}/python-env/bin/python +PYTHON2=${BUILD_DIR}/python2-env/bin/python ###################################################################### @@ -63,6 +64,10 @@ done # Verify klippy host software ###################################################################### -start_test klippy "Test invoke klippy" +start_test klippy "Test invoke klippy (Python3)" $PYTHON scripts/test_klippy.py -d ${DICTDIR} test/klippy/*.test -finish_test klippy "Test invoke klippy" +finish_test klippy "Test invoke klippy (Python3)" + +start_test klippy "Test invoke klippy (Python2)" +$PYTHON2 scripts/test_klippy.py -d ${DICTDIR} test/klippy/*.test +finish_test klippy "Test invoke klippy (Python2)" diff --git a/scripts/ci-install.sh b/scripts/ci-install.sh index ddcdb84a..031b1009 100755 --- a/scripts/ci-install.sh +++ b/scripts/ci-install.sh @@ -49,10 +49,20 @@ fi ###################################################################### -# Create python virtualenv environment +# Create python3 virtualenv environment ###################################################################### -echo -e "\n\n=============== Install python virtualenv\n\n" +echo -e "\n\n=============== Install python3 virtualenv\n\n" cd ${MAIN_DIR} -virtualenv -p python2 ${BUILD_DIR}/python-env +virtualenv -p python3 ${BUILD_DIR}/python-env ${BUILD_DIR}/python-env/bin/pip install -r ${MAIN_DIR}/scripts/klippy-requirements.txt + + +###################################################################### +# Create python2 virtualenv environment +###################################################################### + +echo -e "\n\n=============== Install python2 virtualenv\n\n" +cd ${MAIN_DIR} +virtualenv -p python2 ${BUILD_DIR}/python2-env +${BUILD_DIR}/python2-env/bin/pip install -r ${MAIN_DIR}/scripts/klippy-requirements.txt |