tyler.durden/powerline
1
0
Fork 0
mirror of https://github.com/powerline/powerline.git synced 2025-07-25 06:46:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1779 from ZyX-I/vterm-standard-tmpdir-fixes

Browse Source 
Add some fixes for vterm tests
This commit is contained in:
Nikolai Aleksandrovich Pavlov 2017-05-21 16:30:41 +03:00 committed by GitHub
commit 3df98fc276
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/shlib/vterm.sh
View File

@ -2,9 +2,7 @@
set +x set +x
vterm_setup() { vterm_setup() {
local vterm_suf="$1" ; shift make_test_root
make_test_root "vterm_$vterm_suf"
mkdir "$TEST_ROOT/path" mkdir "$TEST_ROOT/path"

2
tests/test_in_vterm/test_tmux.sh
View File

@ -4,7 +4,7 @@
enter_suite tmux enter_suite tmux
vterm_setup tmux vterm_setup
ln -s "$(which env)" "$TEST_ROOT/path" ln -s "$(which env)" "$TEST_ROOT/path"
ln -s "$(which cut)" "$TEST_ROOT/path" ln -s "$(which cut)" "$TEST_ROOT/path"

10
tests/test_in_vterm/test_vim.sh
View File

@ -3,11 +3,9 @@
. tests/shlib/vterm.sh . tests/shlib/vterm.sh
. tests/shlib/vim.sh . tests/shlib/vim.sh
enter_suite vim enter_suite vvim
VTERM_TEST_DIR="$ROOT/tests/vterm_vim" vterm_setup
vterm_setup "$VTERM_TEST_DIR"
test_vim() { test_vim() {
if test "$PYTHON_IMPLEMENTATION" != CPython ; then if test "$PYTHON_IMPLEMENTATION" != CPython ; then
@ -17,7 +15,7 @@ test_vim() {
if ! which "$POWERLINE_VIM_EXE" ; then if ! which "$POWERLINE_VIM_EXE" ; then
return 0 return 0
fi fi
ln -sf "$(which "${POWERLINE_VIM_EXE}")" "$VTERM_TEST_DIR/path/vim" ln -sf "$(which "${POWERLINE_VIM_EXE}")" "$TEST_ROOT/path/vim"
f="$ROOT/tests/test_in_vterm/test_vim.py" f="$ROOT/tests/test_in_vterm/test_vim.py"
if ! "${PYTHON}" "$f" ; then if ! "${PYTHON}" "$f" ; then
local test_name="$(LANG=C "$POWERLINE_VIM_EXE" --cmd 'echo version' --cmd qa 2>&1)" local test_name="$(LANG=C "$POWERLINE_VIM_EXE" --cmd 'echo version' --cmd qa 2>&1)"
@ -36,6 +34,6 @@ else
test_vim || true test_vim || true
fi fi
vterm_shutdown "$VTERM_TEST_DIR" vterm_shutdown
exit_suite exit_suite