IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.2129: using hard coded executable path in test

Browse Source 
Problem:    Using hard coded executable path in test.
Solution:   Use v:progpath. Use $VIMRUNTIME instead of "runtime". (James
            McCoy, closes vim/vim#5025)
1ac41a5c13
This commit is contained in:
Jan Edmund Lazo 2020-02-08 18:02:26 -05:00
parent a1d6c2f5c9
commit e5aeb2e193
No known key found for this signature in database
GPG Key ID: 64915E6E9F735B15
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/testdir/test49.vim
View File

@ -1,6 +1,6 @@
" Vim script language tests " Vim script language tests
" Author: Servatius Brandt <Servatius.Brandt@fujitsu-siemens.com> " Author: Servatius Brandt <Servatius.Brandt@fujitsu-siemens.com>
" Last Change: 2019 May 24 " Last Change: 2019 Oct 08
"------------------------------------------------------------------------------- "-------------------------------------------------------------------------------
" Test environment {{{1 " Test environment {{{1
@ -456,7 +456,7 @@ function! ExtraVim(...)
" messing up the user's viminfo file. " messing up the user's viminfo file.
let redirect = a:0 ? let redirect = a:0 ?
\ " -c 'au VimLeave * redir END' -c 'redir\\! >" . a:1 . "'" : "" \ " -c 'au VimLeave * redir END' -c 'redir\\! >" . a:1 . "'" : ""
exec "!echo '" . debug_quits . "q' | $NVIM_PRG -u NONE -N -es" . redirect . exec "!echo '" . debug_quits . "q' | " .. v:progpath .. " -u NONE -N -es" . redirect .
\ " -c 'debuggreedy|set viminfo+=nviminfo'" . \ " -c 'debuggreedy|set viminfo+=nviminfo'" .
\ " -c 'let ExtraVimBegin = " . extra_begin . "'" . \ " -c 'let ExtraVimBegin = " . extra_begin . "'" .
\ " -c 'let ExtraVimResult = \"" . resultfile . "\"'" . breakpoints . \ " -c 'let ExtraVimResult = \"" . resultfile . "\"'" . breakpoints .

6
src/nvim/testdir/test_compiler.vim
View File

@ -39,9 +39,9 @@ endfunc
func Test_compiler_without_arg() func Test_compiler_without_arg()
let a=split(execute('compiler')) let a=split(execute('compiler'))
call assert_match('^.*runtime/compiler/ant.vim$', a[0]) call assert_match($VIMRUNTIME .. '/compiler/ant.vim$', a[0])
call assert_match('^.*runtime/compiler/bcc.vim$', a[1]) call assert_match($VIMRUNTIME .. '/compiler/bcc.vim$', a[1])
call assert_match('^.*runtime/compiler/xmlwf.vim$', a[-1]) call assert_match($VIMRUNTIME .. '/compiler/xmlwf.vim$', a[-1])
endfunc endfunc
func Test_compiler_completion() func Test_compiler_completion()

10
src/nvim/testdir/test_spell.vim
View File

@ -132,18 +132,18 @@ func Test_spellinfo()
new new
set enc=latin1 spell spelllang=en set enc=latin1 spell spelllang=en
call assert_match("^\nfile: .*/runtime/spell/en.latin1.spl\n$", execute('spellinfo')) call assert_match("^\nfile: " .. $VIMRUNTIME .. "/spell/en.latin1.spl\n$", execute('spellinfo'))
set enc=cp1250 spell spelllang=en set enc=cp1250 spell spelllang=en
call assert_match("^\nfile: .*/runtime/spell/en.ascii.spl\n$", execute('spellinfo')) call assert_match("^\nfile: " .. $VIMRUNTIME .. "/spell/en.ascii.spl\n$", execute('spellinfo'))
set enc=utf-8 spell spelllang=en set enc=utf-8 spell spelllang=en
call assert_match("^\nfile: .*/runtime/spell/en.utf-8.spl\n$", execute('spellinfo')) call assert_match("^\nfile: " .. $VIMRUNTIME .. "/spell/en.utf-8.spl\n$", execute('spellinfo'))
set enc=latin1 spell spelllang=en_us,en_nz set enc=latin1 spell spelllang=en_us,en_nz
call assert_match("^\n" . call assert_match("^\n" .
\ "file: .*/runtime/spell/en.latin1.spl\n" . \ "file: " .. $VIMRUNTIME .. "/spell/en.latin1.spl\n" .
\ "file: .*/runtime/spell/en.latin1.spl\n$", execute('spellinfo')) \ "file: " .. $VIMRUNTIME .. "/spell/en.latin1.spl\n$", execute('spellinfo'))
set spell spelllang= set spell spelllang=
call assert_fails('spellinfo', 'E756:') call assert_fails('spellinfo', 'E756:')