Use verboser installation, check for installed powerline

This commit is contained in:
Foo 2017-12-02 17:20:16 +03:00
parent d18b58821b
commit 0c594b0b34
2 changed files with 4 additions and 2 deletions

View File

@ -46,13 +46,13 @@ if test -n "$USE_UCS2_PYTHON" ; then
mkvirtualenv -p "$PYTHON" cpython-ucs2-$UCS2_PYTHON_VARIANT
set -e
. tests/bot-ci/scripts/common/main.sh
pip install .
pip install --verbose --verbose --verbose .
if test "$UCS2_PYTHON_VARIANT" = "2.6" ; then
rm tests/bot-ci/deps/wheels/ucs2-CPython-${UCS2_PYTHON_VARIANT}*/pyuv*.whl
fi
pip install --no-deps tests/bot-ci/deps/wheels/ucs2-CPython-${UCS2_PYTHON_VARIANT}*/*.whl
else
pip install .
pip install --verbose --verbose --verbose .
# FIXME Uv watcher sometimes misses events and INotify is not available in
# Python-2.6, thus pyuv should be removed in order for VCS tests to
# pass.

View File

@ -62,6 +62,8 @@ if test -e "$ROOT/scripts/powerline" ; then
ln -s "$ROOT/scripts/powerline" "$TEST_ROOT/path"
elif test -e client/powerline ; then
ln -s "$ROOT/client/powerline" "$TEST_ROOT/path"
elif which powerline ; then
ln -s "$(which powerline)" "$TEST_ROOT/path"
else
echo "Executable powerline was not found"
exit 1