diff --git a/gitlab/before_test.sh b/gitlab/before_test.sh index 733b7c6471288387d84ecb30a08ef23cd0072733..6181d97699fbaaf8019e6748b4604cc6a0dee094 100755 --- a/gitlab/before_test.sh +++ b/gitlab/before_test.sh @@ -26,5 +26,4 @@ if [ "${CI_PROJECT_NAME}" == "bob.buildout" ]; then run_cmd ${use_pip} install --upgrade --no-binary ":all:" zc.recipe.egg fi -run_cmd ${use_pip} install --upgrade --no-index coverage sphinx nosetests run_cmd ${use_pip} install --upgrade --use-wheel --no-index --pre dist/*.whl diff --git a/gitlab/test.sh b/gitlab/test.sh index 463c87ebb8a6b73033324de2aeb5a81ea0a95d61..85ac251a22e2d266cfd12bc0d394d4b91c7051d3 100755 --- a/gitlab/test.sh +++ b/gitlab/test.sh @@ -6,8 +6,8 @@ source $(dirname ${0})/functions.sh run_cmd cd ${PREFIX} # The tests: -run_cmd ${PREFIX}/bin/coverage run --source=${CI_PROJECT_NAME} ${PREFIX}/bin/nosetests -sv ${CI_PROJECT_NAME} -run_cmd ${PREFIX}/bin/coverage report -run_cmd ${PREFIX}/bin/sphinx-build -b doctest ${CI_PROJECT_DIR}/doc ${CI_PROJECT_NAME}/sphinx +run_cmd ${PREFIX}/bin/python ${BOB_PREFIX_PATH}/bin/coverage run --source=${CI_PROJECT_NAME} ${BOB_PREFIX_PATH}/bin/nosetests -sv ${CI_PROJECT_NAME} +run_cmd ${PREFIX}/bin/python ${BOB_PREFIX_PATH}/bin/coverage report +run_cmd ${PREFIX}/bin/python ${BOB_PREFIX_PATH}/bin/sphinx-build -b doctest ${CI_PROJECT_DIR}/doc ${CI_PROJECT_NAME}/sphinx run_cmd cd ${CI_PROJECT_DIR}