Mercurial > vim
diff src/testdir/shared.vim @ 11175:9836b701afd9 v8.0.0474
patch 8.0.0474: the client-server feature is not tested
commit https://github.com/vim/vim/commit/15bf76d40be1f1622ff5cc16596c308e76e2ca94
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Mar 18 16:18:37 2017 +0100
patch 8.0.0474: the client-server feature is not tested
Problem: The client-server feature is not tested.
Solution: Add a test.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 18 Mar 2017 16:30:04 +0100 |
parents | ca8f2d24a79c |
children | c3227699ad4d |
line wrap: on
line diff
--- a/src/testdir/shared.vim +++ b/src/testdir/shared.vim @@ -164,6 +164,22 @@ func s:feedkeys(timer) call feedkeys('x', 'nt') endfunc +" Get the command to run Vim, with -u NONE and --not-a-term arguments. +" Returns an empty string on error. +func GetVimCommand() + if !filereadable('vimcmd') + return '' + endif + let cmd = readfile('vimcmd')[0] + let cmd = substitute(cmd, '-u \f\+', '-u NONE', '') + if cmd !~ '-u NONE' + let cmd = cmd . ' -u NONE' + endif + let cmd .= ' --not-a-term' + let cmd = substitute(cmd, 'VIMRUNTIME=.*VIMRUNTIME;', '', '') + return cmd +endfunc + " Run Vim, using the "vimcmd" file and "-u NORC". " "before" is a list of Vim commands to be executed before loading plugins. " "after" is a list of Vim commands to be executed after loading plugins. @@ -174,7 +190,8 @@ func RunVim(before, after, arguments) endfunc func RunVimPiped(before, after, arguments, pipecmd) - if !filereadable('vimcmd') + let cmd = GetVimCommand() + if cmd == '' return 0 endif let args = '' @@ -187,18 +204,6 @@ func RunVimPiped(before, after, argument let args .= ' -S Xafter.vim' endif - let cmd = readfile('vimcmd')[0] - let cmd = substitute(cmd, '-u \f\+', '-u NONE', '') - if cmd !~ '-u NONE' - let cmd = cmd . ' -u NONE' - endif - let cmd .= ' --not-a-term' - - " With pipecmd we can't set VIMRUNTIME. - if a:pipecmd != '' - let cmd = substitute(cmd, 'VIMRUNTIME=.*VIMRUNTIME;', '', '') - endif - exe "silent !" . a:pipecmd . cmd . args . ' ' . a:arguments if len(a:before) > 0