Fix tests; Don't use pwd, but prefer CI_PROJECT_DIR

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
 

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

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}