Use python from venv for testing.

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
This commit is contained in:
Keith Rothman
2021-01-14 16:36:48 -08:00
parent 073b1fe5f2
commit 5a245999e9
2 changed files with 6 additions and 6 deletions

View File

@@ -557,7 +557,7 @@ jobs:
source env/bin/activate
;;
windows*)
Scripts\activate.bat
Scripts/activate.bat
;;
esac
cd api/python
@@ -572,7 +572,7 @@ jobs:
source env/bin/activate
;;
windows*)
Scripts\activate.bat
Scripts/activate.bat
;;
esac
c4_build_target shared64 ryml-api-test-python3

View File

@@ -108,7 +108,7 @@ if(RYML_BUILD_API_PYTHON)
get_filename_component(script_name ${script} NAME_WE)
set(script ${pydir}/test/${script})
set(tn ryml-api-test-python3-${script_name})
set(cmd ${CMAKE_COMMAND} -E env ${Python3_EXECUTABLE} ${script})
set(cmd python ${script})
add_custom_target(${tn}
COMMAND ${cmd}
DEPENDS ${t})
@@ -125,11 +125,11 @@ if(RYML_BUILD_API_PYTHON)
c4_set_folder_remote_project_targets("bm" ryml-api-bm-python3)
set(script ${pydir}/test/parse_bm.py)
c4_add_benchmark_cmd(ryml-api-bm-python3-travis
COMMAND ${CMAKE_COMMAND} -E env ${Python3_EXECUTABLE} ${script} ${CMAKE_CURRENT_LIST_DIR}/../bm/cases/travis.yml ryml)
COMMAND python ${script} ${CMAKE_CURRENT_LIST_DIR}/../bm/cases/travis.yml ryml)
c4_add_benchmark_cmd(ryml-api-bm-python3-appveyor
COMMAND ${CMAKE_COMMAND} -E env ${Python3_EXECUTABLE} ${script} ${CMAKE_CURRENT_LIST_DIR}/../bm/cases/appveyor.yml ryml)
COMMAND python ${script} ${CMAKE_CURRENT_LIST_DIR}/../bm/cases/appveyor.yml ryml)
c4_add_benchmark_cmd(ryml-api-bm-python3-compile_commands
COMMAND ${CMAKE_COMMAND} -E env ${Python3_EXECUTABLE} ${script} ${CMAKE_CURRENT_LIST_DIR}/../bm/cases/compile_commands.json ryml)
COMMAND python ${script} ${CMAKE_CURRENT_LIST_DIR}/../bm/cases/compile_commands.json ryml)
c4_set_folder_remote_project_targets("bm" ryml-bm-api-python3-travis)
c4_set_folder_remote_project_targets("bm" ryml-bm-api-python3-appveyor)
c4_set_folder_remote_project_targets("bm" ryml-bm-api-python3-compile_commands)