To: vim_dev@googlegroups.com Subject: Patch 8.1.2129 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.2129 Problem: Using hard coded executable path in test. Solution: Use v:progpath. Use $VIMRUNTIME instead of "runtime". (James McCoy, closes #5025) Files: src/testdir/test49.vim, src/testdir/test_compiler.vim, src/testdir/test_spell.vim *** ../vim-8.1.2128/src/testdir/test49.vim 2019-09-01 14:45:23.753964955 +0200 --- src/testdir/test49.vim 2019-10-08 22:58:41.497061370 +0200 *************** *** 1,6 **** " Vim script language tests " Author: Servatius Brandt ! " Last Change: 2019 May 24 "------------------------------------------------------------------------------- " Test environment {{{1 --- 1,6 ---- " Vim script language tests " Author: Servatius Brandt ! " Last Change: 2019 Oct 08 "------------------------------------------------------------------------------- " Test environment {{{1 *************** *** 456,462 **** " 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 . \ " -c 'debuggreedy|set viminfo+=nviminfo'" . \ " -c 'let ExtraVimBegin = " . extra_begin . "'" . \ " -c 'let ExtraVimResult = \"" . resultfile . "\"'" . breakpoints . --- 456,462 ---- " 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' | " .. v:progpath .. " -u NONE -N -Xes" . redirect . \ " -c 'debuggreedy|set viminfo+=nviminfo'" . \ " -c 'let ExtraVimBegin = " . extra_begin . "'" . \ " -c 'let ExtraVimResult = \"" . resultfile . "\"'" . breakpoints . *** ../vim-8.1.2128/src/testdir/test_compiler.vim 2019-09-18 21:42:34.564859024 +0200 --- src/testdir/test_compiler.vim 2019-10-10 13:25:54.154728025 +0200 *************** *** 39,47 **** 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]) endfunc func Test_compiler_completion() --- 39,47 ---- func Test_compiler_without_arg() let a=split(execute('compiler')) ! 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() *** ../vim-8.1.2128/src/testdir/test_spell.vim 2019-09-07 19:05:02.341280926 +0200 --- src/testdir/test_spell.vim 2019-10-10 13:28:31.354031184 +0200 *************** *** 130,147 **** new set enc=latin1 spell spelllang=en ! call assert_match("^\nfile: .*/runtime/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')) set enc=utf-8 spell spelllang=en ! call assert_match("^\nfile: .*/runtime/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')) set spell spelllang= call assert_fails('spellinfo', 'E756:') --- 130,147 ---- new set enc=latin1 spell spelllang=en ! call assert_match("^\nfile: " .. $VIMRUNTIME .. "/spell/en.latin1.spl\n$", execute('spellinfo')) set enc=cp1250 spell spelllang=en ! call assert_match("^\nfile: " .. $VIMRUNTIME .. "/spell/en.ascii.spl\n$", execute('spellinfo')) set enc=utf-8 spell spelllang=en ! 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: " .. $VIMRUNTIME .. "/spell/en.latin1.spl\n" . ! \ "file: " .. $VIMRUNTIME .. "/spell/en.latin1.spl\n$", execute('spellinfo')) set spell spelllang= call assert_fails('spellinfo', 'E756:') *** ../vim-8.1.2128/src/version.c 2019-10-10 13:22:36.967636155 +0200 --- src/version.c 2019-10-10 13:27:13.146375365 +0200 *************** *** 755,756 **** --- 755,758 ---- { /* Add new patch number below this line */ + /**/ + 2129, /**/ -- Shaw's Principle: Build a system that even a fool can use, and only a fool will want to use it. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///