diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-10-10 13:30:12 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-10-10 13:30:12 +0200 |
| commit | 1ac41a5c1352306942344777d2ba86dccd84ffad (patch) | |
| tree | 17371b356f3e214da8605295511d1cf66623d1ad | |
| parent | 93268054428fe3a6bbe3f89d2def2fec4eabcf5f (diff) | |
patch 8.1.2129: using hard coded executable path in testv8.1.2129
Problem: Using hard coded executable path in test.
Solution: Use v:progpath. Use $VIMRUNTIME instead of "runtime". (James
McCoy, closes #5025)
| -rw-r--r-- | src/testdir/test49.vim | 4 | ||||
| -rw-r--r-- | src/testdir/test_compiler.vim | 6 | ||||
| -rw-r--r-- | src/testdir/test_spell.vim | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 12 insertions, 10 deletions
diff --git a/src/testdir/test49.vim b/src/testdir/test49.vim index bd6051461b..b6f6f6b5dc 100644 --- a/src/testdir/test49.vim +++ b/src/testdir/test49.vim @@ -1,6 +1,6 @@ " Vim script language tests " Author: Servatius Brandt <Servatius.Brandt@fujitsu-siemens.com> -" Last Change: 2019 May 24 +" Last Change: 2019 Oct 08 "------------------------------------------------------------------------------- " Test environment {{{1 @@ -456,7 +456,7 @@ function ExtraVim(...) " messing up the user's viminfo file. let redirect = a:0 ? \ " -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 'let ExtraVimBegin = " . extra_begin . "'" . \ " -c 'let ExtraVimResult = \"" . resultfile . "\"'" . breakpoints . diff --git a/src/testdir/test_compiler.vim b/src/testdir/test_compiler.vim index 40d3cdbdae..06522d77ec 100644 --- a/src/testdir/test_compiler.vim +++ b/src/testdir/test_compiler.vim @@ -39,9 +39,9 @@ endfunc func Test_compiler_without_arg() let a=split(execute('compiler')) - call assert_match('^.*runtime/compiler/ant.vim$', a[0]) - call assert_match('^.*runtime/compiler/bcc.vim$', a[1]) - call assert_match('^.*runtime/compiler/xmlwf.vim$', a[-1]) + call assert_match($VIMRUNTIME .. '/compiler/ant.vim$', a[0]) + call assert_match($VIMRUNTIME .. '/compiler/bcc.vim$', a[1]) + call assert_match($VIMRUNTIME .. '/compiler/xmlwf.vim$', a[-1]) endfunc func Test_compiler_completion() diff --git a/src/testdir/test_spell.vim b/src/testdir/test_spell.vim index a44d95534f..523126652d 100644 --- a/src/testdir/test_spell.vim +++ b/src/testdir/test_spell.vim @@ -130,18 +130,18 @@ func Test_spellinfo() new 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 - 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 - 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 call assert_match("^\n" . - \ "file: .*/runtime/spell/en.latin1.spl\n" . - \ "file: .*/runtime/spell/en.latin1.spl\n$", execute('spellinfo')) + \ "file: " .. $VIMRUNTIME .. "/spell/en.latin1.spl\n" . + \ "file: " .. $VIMRUNTIME .. "/spell/en.latin1.spl\n$", execute('spellinfo')) set spell spelllang= call assert_fails('spellinfo', 'E756:') diff --git a/src/version.c b/src/version.c index 7ad0acd936..f9a30285d4 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2129, +/**/ 2128, /**/ 2127, |