Fix tests to use ANSIBLE_TEST_PYTHON_INTERPRETER.

pull/51706/head
Matt Clay 6 years ago
parent 523cb8b5a4
commit 6ac22416af

@ -7,12 +7,7 @@ MYTMPDIR=$(mktemp -d 2>/dev/null || mktemp -d -t 'mytmpdir')
trap 'rm -rf "${MYTMPDIR}"' EXIT trap 'rm -rf "${MYTMPDIR}"' EXIT
# This is needed for the ubuntu1604py3 tests virtualenv --system-site-packages --python "${ANSIBLE_TEST_PYTHON_INTERPRETER}" "${MYTMPDIR}/jinja2"
# Ubuntu patches virtualenv to make the default python2
# but for the python3 tests we need virtualenv to use python3
PYTHON=$("python${ANSIBLE_TEST_PYTHON_VERSION:-}" -c "import sys; print(sys.executable)")
virtualenv --system-site-packages --python "${PYTHON}" "${MYTMPDIR}/jinja2"
source "${MYTMPDIR}/jinja2/bin/activate" source "${MYTMPDIR}/jinja2/bin/activate"

@ -7,12 +7,7 @@ MYTMPDIR=$(mktemp -d 2>/dev/null || mktemp -d -t 'mytmpdir')
trap 'rm -rf "${MYTMPDIR}"' EXIT trap 'rm -rf "${MYTMPDIR}"' EXIT
# This is needed for the ubuntu1604py3 tests virtualenv --system-site-packages --python "${ANSIBLE_TEST_PYTHON_INTERPRETER}" "${MYTMPDIR}/jinja2"
# Ubuntu patches virtualenv to make the default python2
# but for the python3 tests we need virtualenv to use python3
PYTHON=$("python${ANSIBLE_TEST_PYTHON_VERSION:-}" -c "import sys; print(sys.executable)")
virtualenv --system-site-packages --python "${PYTHON}" "${MYTMPDIR}/jinja2"
source "${MYTMPDIR}/jinja2/bin/activate" source "${MYTMPDIR}/jinja2/bin/activate"

Loading…
Cancel
Save