Merge "Revert "Add the possibility to work without python virtualenv""

This commit is contained in:
Jenkins 2014-12-22 16:48:19 +00:00 committed by Gerrit Code Review
commit 0df8749470

View File

@ -359,13 +359,15 @@ RunTest() {
fi
fi
if [ -z "${VENV_PATH}" ]; then
VENV_PATH="/home/jenkins/venv-nailgun-tests"
fi
# run python virtualenv
if [ -n "$VENV_PATH" ]; then
if [ "${DRY_RUN}" = "yes" ]; then
echo source $VENV_PATH/bin/activate
else
source $VENV_PATH/bin/activate
fi
if [ "${DRY_RUN}" = "yes" ]; then
echo . $VENV_PATH/bin/activate
else
. $VENV_PATH/bin/activate
fi
if [ "${ENV_NAME}" = "" ]; then