mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-15 14:26:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.1846: inconsistently using GetVimCommand() and v:progpath

Browse Source 
Problem:    Inconsistently using GetVimCommand() and v:progpath. (Daniel
            Hahler)
Solution:   Use GetVimCommand(). (closes vim/vim#4806)
93344c2d70

Cherry-pick a change to test_profile.vim from patch 8.1.1544.
Cherry-pick a change to test_vimscript.vim from patch 8.1.1826.

Some of the args are no-op in Nvim, and `-i NONE` and `--headless` are
already added by `GetVimCommand()`. I'll try to match the order of args
in upstream, substituting `--not-a-term` with `--headless`.
This commit is contained in:
zeertzjq
2022-02-14 18:56:30 +08:00
parent 046950f630
commit 8a80ab27bd
6 changed files with 42 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/nvim/testdir/test_system.vim
View File

@@ -50,11 +50,11 @@ endfunc
func Test_system_exmode()
if has('unix') " echo $? only works on Unix
let cmd = ' -es --headless -u NONE -c "source Xscript" +q; echo "result=$?"'
let cmd = ' -es -c "source Xscript" +q; echo "result=$?"'
" Need to put this in a script, "catch" isn't found after an unknown
" function.
call writefile(['try', 'call doesnotexist()', 'catch', 'endtry'], 'Xscript')
let a = system(v:progpath . cmd)
let a = system(GetVimCommand() . cmd)
call assert_match('result=0', a)
call assert_equal(0, v:shell_error)
endif
@@ -62,33 +62,33 @@ func Test_system_exmode()
" Error before try does set error flag.
call writefile(['call nosuchfunction()', 'try', 'call doesnotexist()', 'catch', 'endtry'], 'Xscript')
if has('unix') " echo $? only works on Unix
let a = system(v:progpath . cmd)
let a = system(GetVimCommand() . cmd)
call assert_notequal('0', a[0])
endif
let cmd = ' -es --headless -u NONE -c "source Xscript" +q'
let a = system(v:progpath . cmd)
let cmd = ' -es -c "source Xscript" +q'
let a = system(GetVimCommand() . cmd)
call assert_notequal(0, v:shell_error)
call delete('Xscript')
if has('unix') " echo $? only works on Unix
let cmd = ' -es --headless -u NONE -c "call doesnotexist()" +q; echo $?'
let a = system(v:progpath. cmd)
let cmd = ' -es -c "call doesnotexist()" +q; echo $?'
let a = system(GetVimCommand() . cmd)
call assert_notequal(0, a[0])
endif
let cmd = ' -es --headless -u NONE -c "call doesnotexist()" +q'
let a = system(v:progpath. cmd)
let cmd = ' -es -c "call doesnotexist()" +q'
let a = system(GetVimCommand(). cmd)
call assert_notequal(0, v:shell_error)
if has('unix') " echo $? only works on Unix
let cmd = ' -es --headless -u NONE -c "call doesnotexist()|let a=1" +q; echo $?'
let a = system(v:progpath. cmd)
let cmd = ' -es -c "call doesnotexist()|let a=1" +q; echo $?'
let a = system(GetVimCommand() . cmd)
call assert_notequal(0, a[0])
endif
let cmd = ' -es --headless -u NONE -c "call doesnotexist()|let a=1" +q'
let a = system(v:progpath. cmd)
let cmd = ' -es -c "call doesnotexist()|let a=1" +q'
let a = system(GetVimCommand() . cmd)
call assert_notequal(0, v:shell_error)
endfunc