aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

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 #5025)
This commit is contained in:
Bram Moolenaar
2019-10-10 13:30:12 +02:00
parent 9326805442
commit 1ac41a5c13
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/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' | ../vim -u NONE -N -Xes" . redirect . exec "!echo '" . debug_quits . "q' | " .. v:progpath .. " -u NONE -N -Xes" . 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/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/testdir/test_spell.vim
View File

@@ -130,18 +130,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:')

2
src/version.c
View File

@@ -753,6 +753,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2129,
/**/ /**/
2128, 2128,
/**/ /**/