mirror of
https://github.com/junegunn/vim-plug.git
synced 2025-12-06 09:04:23 +08:00
Migrate travis to use new docker system.
* Travis now installs built vim into $DEPS. * test/run now detects best vim to use. * python: Fix small display issue with error messages.
This commit is contained in:
19
test/run
19
test/run
@@ -85,13 +85,26 @@ DOC
|
||||
cd "$BASE"
|
||||
}
|
||||
|
||||
select_vim() {
|
||||
local vim=/usr/bin/vim
|
||||
if [ -n "$DEPS" ] && [ -e "${DEPS}/bin/vim" ]; then
|
||||
vim="${DEPS}/bin/vim"
|
||||
elif [ -e "/usr/local/bin/vim" ]; then
|
||||
vim=/usr/local/bin/vim
|
||||
fi
|
||||
echo $vim
|
||||
}
|
||||
|
||||
clone_repos
|
||||
prepare
|
||||
|
||||
VIM=$(select_vim)
|
||||
echo "Selected Vim: $VIM"
|
||||
if [ "$1" = '!' ]; then
|
||||
/usr/local/bin/vim -Nu /tmp/mini-vimrc -c 'Vader! test.vader' > /dev/null &&
|
||||
$VIM -Nu /tmp/mini-vimrc -c 'Vader! test.vader' > /dev/null &&
|
||||
prepare &&
|
||||
/usr/local/bin/vim -Nu /tmp/mini-vimrc -c 'let g:plug_threads = 1 | Vader! test.vader' > /dev/null
|
||||
$VIM -Nu /tmp/mini-vimrc -c 'let g:plug_threads = 1 | Vader! test.vader' > /dev/null
|
||||
else
|
||||
/usr/local/bin/vim -Nu /tmp/mini-vimrc -c 'Vader test.vader'
|
||||
$VIM -Nu /tmp/mini-vimrc -c 'Vader test.vader'
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user