From 9d7366436b4821bb2fa9444479eccd4b195f95de Mon Sep 17 00:00:00 2001
From: Foo <kp-pav@yandex.ru>
Date: Sun, 30 Apr 2017 13:55:24 +0300
Subject: [PATCH] Move some env variables definition out of run_vim_tests.sh

---
 tests/run_vim_tests.sh | 37 +++----------------------------------
 tests/vim.sh           | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 34 deletions(-)
 create mode 100644 tests/vim.sh

diff --git a/tests/run_vim_tests.sh b/tests/run_vim_tests.sh
index c32831db..798d5536 100755
--- a/tests/run_vim_tests.sh
+++ b/tests/run_vim_tests.sh
@@ -1,40 +1,9 @@
 #!/bin/sh
 . tests/common.sh
+. tests/vim.sh
 
 enter_suite vim
 
-if test -z "$VIM" ; then
-	if test -n "$USE_UCS2_PYTHON" ; then
-		NEW_VIM="$ROOT/tests/bot-ci/deps/vim/master-$UCS2_PYTHON_VARIANT-ucs2-double/vim"
-		OLD_VIM="$ROOT/tests/bot-ci/deps/vim/v7.0.112-$UCS2_PYTHON_VARIANT-ucs2/vim"
-		opt_dir="$HOME/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
-		if test -d "$ROOT/tests/bot-ci/deps" ; then
-			NEW_VIM="$ROOT/tests/bot-ci/deps/vim/master-$PYTHON_MM/vim"
-			OLD_VIM="$ROOT/tests/bot-ci/deps/vim/v7.0.112-$PYTHON_MM/vim"
-		else
-			NEW_VIM="vim"
-		fi
-		if test -e "$OLD_VIM" ; then
-			VIMS="NEW_VIM OLD_VIM"
-		else
-			VIMS="NEW_VIM"
-		fi
-	fi
-else
-	NEW_VIM="$VIM"
-	OLD_VIM="$VIM"
-fi
-
 # Define some overrides. These ones must be ignored and do not affect Vim 
 # status/tab lines.
 export POWERLINE_CONFIG_OVERRIDES='common.default_top_theme=ascii'
@@ -48,9 +17,9 @@ test_script() {
 	if ! test -e "$vim" ; then
 		return 0
 	fi
-	if ! "$vim" -u NONE -S $script || test -f message.fail ; then
+	if ! "$vim" -u NONE -S "$script" || test -f message.fail ; then
 		local test_name="$test_name_prefix-${script##*/}"
-		fail "${test_name%.vim}" F "Failed script $script run with $VIM"
+		fail "${test_name%.vim}" F "Failed script $script run with $vim"
 		cat message.fail >&2
 		rm message.fail
 	fi
diff --git a/tests/vim.sh b/tests/vim.sh
new file mode 100644
index 00000000..49346dac
--- /dev/null
+++ b/tests/vim.sh
@@ -0,0 +1,33 @@
+. tests/bot-ci/scripts/common/main.sh
+
+if test -z "$POWERLINE_VIM_EXE" ; then
+	if test -n "$USE_UCS2_PYTHON" ; then
+		NEW_VIM="$ROOT/tests/bot-ci/deps/vim/master-$UCS2_PYTHON_VARIANT-ucs2-double/vim"
+		OLD_VIM="$ROOT/tests/bot-ci/deps/vim/v7.0.112-$UCS2_PYTHON_VARIANT-ucs2/vim"
+		opt_dir="$HOME/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
+		if test -d "$ROOT/tests/bot-ci/deps" ; then
+			NEW_VIM="$ROOT/tests/bot-ci/deps/vim/master-$PYTHON_MM/vim"
+			OLD_VIM="$ROOT/tests/bot-ci/deps/vim/v7.0.112-$PYTHON_MM/vim"
+		else
+			NEW_VIM="vim"
+		fi
+		if test -e "$OLD_VIM" ; then
+			VIMS="NEW_VIM OLD_VIM"
+		else
+			VIMS="NEW_VIM"
+		fi
+	fi
+else
+	NEW_VIM="$POWERLINE_VIM_EXE"
+	OLD_VIM="$POWERLINE_VIM_EXE"
+fi