• R/O
  • SSH

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim


Commit MetaInfo

Revision57b18521216fce816a011881cf8cebb00bf6569e (tree)
Time2019-10-10 20:45:04
AuthorBram Moolenaar <Bram@vim....>
CommiterBram Moolenaar

Log Message

patch 8.1.2129: using hard coded executable path in test

Commit: https://github.com/vim/vim/commit/1ac41a5c1352306942344777d2ba86dccd84ffad
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Oct 10 13:30:12 2019 +0200

patch 8.1.2129: using hard coded executable path in test
Problem: Using hard coded executable path in test.
Solution: Use v:progpath. Use $VIMRUNTIME instead of "runtime". (James
McCoy, closes #5025)

Change Summary

Incremental Difference

diff -r 3319258f7b5b -r 57b18521216f src/testdir/test49.vim
--- a/src/testdir/test49.vim Thu Oct 10 13:30:05 2019 +0200
+++ b/src/testdir/test49.vim Thu Oct 10 13:45:04 2019 +0200
@@ -1,6 +1,6 @@
11 " Vim script language tests
22 " Author: Servatius Brandt <Servatius.Brandt@fujitsu-siemens.com>
3-" Last Change: 2019 May 24
3+" Last Change: 2019 Oct 08
44
55 "-------------------------------------------------------------------------------
66 " Test environment {{{1
@@ -456,7 +456,7 @@
456456 " messing up the user's viminfo file.
457457 let redirect = a:0 ?
458458 \ " -c 'au VimLeave * redir END' -c 'redir\\! >" . a:1 . "'" : ""
459- exec "!echo '" . debug_quits . "q' | ../vim -u NONE -N -Xes" . redirect .
459+ exec "!echo '" . debug_quits . "q' | " .. v:progpath .. " -u NONE -N -Xes" . redirect .
460460 \ " -c 'debuggreedy|set viminfo+=nviminfo'" .
461461 \ " -c 'let ExtraVimBegin = " . extra_begin . "'" .
462462 \ " -c 'let ExtraVimResult = \"" . resultfile . "\"'" . breakpoints .
diff -r 3319258f7b5b -r 57b18521216f src/testdir/test_compiler.vim
--- a/src/testdir/test_compiler.vim Thu Oct 10 13:30:05 2019 +0200
+++ b/src/testdir/test_compiler.vim Thu Oct 10 13:45:04 2019 +0200
@@ -39,9 +39,9 @@
3939
4040 func Test_compiler_without_arg()
4141 let a=split(execute('compiler'))
42- call assert_match('^.*runtime/compiler/ant.vim$', a[0])
43- call assert_match('^.*runtime/compiler/bcc.vim$', a[1])
44- call assert_match('^.*runtime/compiler/xmlwf.vim$', a[-1])
42+ call assert_match($VIMRUNTIME .. '/compiler/ant.vim$', a[0])
43+ call assert_match($VIMRUNTIME .. '/compiler/bcc.vim$', a[1])
44+ call assert_match($VIMRUNTIME .. '/compiler/xmlwf.vim$', a[-1])
4545 endfunc
4646
4747 func Test_compiler_completion()
diff -r 3319258f7b5b -r 57b18521216f src/testdir/test_spell.vim
--- a/src/testdir/test_spell.vim Thu Oct 10 13:30:05 2019 +0200
+++ b/src/testdir/test_spell.vim Thu Oct 10 13:45:04 2019 +0200
@@ -130,18 +130,18 @@
130130 new
131131
132132 set enc=latin1 spell spelllang=en
133- call assert_match("^\nfile: .*/runtime/spell/en.latin1.spl\n$", execute('spellinfo'))
133+ call assert_match("^\nfile: " .. $VIMRUNTIME .. "/spell/en.latin1.spl\n$", execute('spellinfo'))
134134
135135 set enc=cp1250 spell spelllang=en
136- call assert_match("^\nfile: .*/runtime/spell/en.ascii.spl\n$", execute('spellinfo'))
136+ call assert_match("^\nfile: " .. $VIMRUNTIME .. "/spell/en.ascii.spl\n$", execute('spellinfo'))
137137
138138 set enc=utf-8 spell spelllang=en
139- call assert_match("^\nfile: .*/runtime/spell/en.utf-8.spl\n$", execute('spellinfo'))
139+ call assert_match("^\nfile: " .. $VIMRUNTIME .. "/spell/en.utf-8.spl\n$", execute('spellinfo'))
140140
141141 set enc=latin1 spell spelllang=en_us,en_nz
142142 call assert_match("^\n" .
143- \ "file: .*/runtime/spell/en.latin1.spl\n" .
144- \ "file: .*/runtime/spell/en.latin1.spl\n$", execute('spellinfo'))
143+ \ "file: " .. $VIMRUNTIME .. "/spell/en.latin1.spl\n" .
144+ \ "file: " .. $VIMRUNTIME .. "/spell/en.latin1.spl\n$", execute('spellinfo'))
145145
146146 set spell spelllang=
147147 call assert_fails('spellinfo', 'E756:')
diff -r 3319258f7b5b -r 57b18521216f src/version.c
--- a/src/version.c Thu Oct 10 13:30:05 2019 +0200
+++ b/src/version.c Thu Oct 10 13:45:04 2019 +0200
@@ -754,6 +754,8 @@
754754 static int included_patches[] =
755755 { /* Add new patch number below this line */
756756 /**/
757+ 2129,
758+/**/
757759 2128,
758760 /**/
759761 2127,
Show on old repository browser