From d51a50223e7cf384d60a6ddaea31a3fc30a20cac Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sat, 3 Jan 2015 00:19:20 +0300
Subject: [PATCH] Use $ROOT in place of $PWD in run_vim_tests, set $PYTHONPATH

Checking whether this fixes Python-2.6 build failure
---
 tests/run_vim_tests.sh | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/tests/run_vim_tests.sh b/tests/run_vim_tests.sh
index cffeb76e..0856a381 100755
--- a/tests/run_vim_tests.sh
+++ b/tests/run_vim_tests.sh
@@ -4,13 +4,20 @@ FAILED=0
 
 if test -z "$VIM" ; then
 	if test -n "$USE_UCS2_PYTHON" ; then
-		NEW_VIM="$PWD/tests/bot-ci/deps/vim/tip-$UCS2_PYTHON_VARIANT-double/vim"
+		NEW_VIM="$ROOT/tests/bot-ci/deps/vim/tip-$UCS2_PYTHON_VARIANT-double/vim"
+		opt_dir="/opt/cpython-ucs2-$UCS2_PYTHON_VARIANT"
+		main_path="$opt_dir/lib/python$UCS2_PYTHON_VARIANT"
+		site_path="$main_path/site-packages"
+		venv_main_path="$VIRTUAL_ENV/lib/python$UCS2_PYTHON_VARIANT"
+		venv_site_path="$venv_main_path/site-packages"
+		new_paths="${main_path}:${site_path}:${venv_main_path}:${venv_site_path}"
+		export PYTHONPATH="$new_paths${PYTHONPATH:+:}$PYTHONPATH"
 	else
 		if test "$PYTHON_IMPLEMENTATION" != "CPython" ; then
 			exit 0
 		fi
-		NEW_VIM="$PWD/tests/bot-ci/deps/vim/tip-$PYTHON_VERSION/vim"
-		OLD_VIM="$PWD/tests/bot-ci/deps/vim/v7-0-112-$PYTHON_VERSION/vim"
+		NEW_VIM="$ROOT/tests/bot-ci/deps/vim/tip-$PYTHON_VERSION/vim"
+		OLD_VIM="$ROOT/tests/bot-ci/deps/vim/v7-0-112-$PYTHON_VERSION/vim"
 		if test -e "$OLD_VIM" ; then
 			VIMS="NEW_VIM OLD_VIM"
 		else