diff --git a/gitlab/before_test.sh b/gitlab/before_test.sh index 39680f828eeff9dd2f0556978f5852072c9b3abb..4d56e5d14956d2d91f627a902b0b7aa42a6befb2 100755 --- a/gitlab/before_test.sh +++ b/gitlab/before_test.sh @@ -6,9 +6,10 @@ source $(dirname ${0})/functions.sh check_env DOCSERVER check_env CONDA_PREFIX check_env CI_PROJECT_NAME +check_env CI_PROJECT_DIR BOB_DOCUMENTATION_SERVER="${DOCSERVER}/software/bob/docs/latest/bob/%s/master/" -PREFIX=`pwd`/${CONDA_PREFIX} +PREFIX=${CI_PROJECT_DIR}/${CONDA_PREFIX} run_cmd $(dirname ${0})/before_build.sh diff --git a/gitlab/functions.sh b/gitlab/functions.sh index c5844f775c3d570113ace77d8d3567915bb401dd..626f886d51dd52a9af80fd820a1e5c895f969784 100644 --- a/gitlab/functions.sh +++ b/gitlab/functions.sh @@ -111,6 +111,11 @@ doc_upload() { # Sets up variables ARCH=`arch` + +check_env ARCH +check_env CONDA_FOLDER +check_env CI_PROJECT_DIR + if [ -z "${CONDA_FOLDER}" ]; then if [ "${ARCH}" == "linux" ]; then CONDA_FOLDER=/local/conda @@ -123,7 +128,7 @@ if [ -z "${CONDA_PREFIX}" ]; then CONDA_PREFIX=env fi -PREFIX=`pwd`/${CONDA_PREFIX} +PREFIX=${CI_PROJECT_DIR}/${CONDA_PREFIX} # Add "-coverage" support if [ "${ARCH}" == "linux" ]; then diff --git a/gitlab/test.sh b/gitlab/test.sh index 8df0162a3fe2c8b143f9a0a560a09afcdfc0de82..c7bab6f9b1e9ad7c625ea1baa2e953cdbfd00316 100755 --- a/gitlab/test.sh +++ b/gitlab/test.sh @@ -6,11 +6,16 @@ source $(dirname ${0})/functions.sh check_env DOCSERVER check_env CONDA_PREFIX check_env CI_PROJECT_NAME +check_env CI_PROJECT_DIR BOB_DOCUMENTATION_SERVER="${DOCSERVER}/software/bob/docs/latest/bob/%s/master/" +PREFIX=${CI_PROJECT_DIR}/${CONDA_PREFIX} -bindir=`pwd`/${CONDA_PREFIX}/bin +run_cmd cd ${PREFIX} -run_cmd ${bindir}/coverage run --source=${CI_PROJECT_NAME} ${bindir}/nosetests -sv ${CI_PROJECT_NAME} -run_cmd ${bindir}/coverage report -run_cmd ${bindir}/sphinx-build -b doctest ../doc ../sphinx +# 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 cd ${CI_PROJECT_DIR}