thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.0409: startup test fails on MS-Windows

Browse Source 
Problem:    Startup test fails on MS-Windows.
Solution:   Do the Arabic test in silent Ex mode.  Loosen the check for -V2.
This commit is contained in:
Bram Moolenaar
2018-09-19 21:06:31 +02:00
parent a87f8fd3fe
commit 4b1c9a91b5
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/testdir/test_startup.vim
View File

@@ -252,16 +252,21 @@ func Test_p_arg()
call delete('Xtestout') call delete('Xtestout')
endfunc endfunc
" Test the -V[N] argument to set the 'version' option to [N] " Test the -V[N] argument to set the 'verbose' option to [N]
func Test_V_arg() func Test_V_arg()
if has('gui_running')
" Can't catch the output of gvim.
return
endif
let out = system(GetVimCommand() . ' --clean -es -X -V0 -c "set verbose?" -cq') let out = system(GetVimCommand() . ' --clean -es -X -V0 -c "set verbose?" -cq')
call assert_equal(" verbose=0\n", out) call assert_equal(" verbose=0\n", out)
let out = system(GetVimCommand() . ' --clean -es -X -V2 -c "set verbose?" -cq') let out = system(GetVimCommand() . ' --clean -es -X -V2 -c "set verbose?" -cq')
call assert_match("^sourcing \"$VIMRUNTIME/defaults\.vim\"\r\nSearching for \"filetype\.vim\".*\n verbose=2\n$", out) call assert_match("sourcing \"$VIMRUNTIME[\\/]defaults\.vim\"\r\nSearching for \"filetype\.vim\".*\n", out)
call assert_match(" verbose=2\n", out)
let out = system(GetVimCommand() . ' --clean -es -X -V15 -c "set verbose?" -cq') let out = system(GetVimCommand() . ' --clean -es -X -V15 -c "set verbose?" -cq')
call assert_match("\+*\nsourcing \"$VIMRUNTIME/defaults\.vim\"\r\nline 1: \" The default vimrc file\..*\n verbose=15\n\+*", out) call assert_match("sourcing \"$VIMRUNTIME[\\/]defaults\.vim\"\r\nline 1: \" The default vimrc file\..* verbose=15\n", out)
endfunc endfunc
" Test the -A, -F and -H arguments (Arabic, Farsi and Hebrew modes). " Test the -A, -F and -H arguments (Arabic, Farsi and Hebrew modes).
@@ -270,7 +275,9 @@ func Test_A_F_H_arg()
\ 'call writefile([&rightleft, &arabic, &fkmap, &hkmap], "Xtestout")', \ 'call writefile([&rightleft, &arabic, &fkmap, &hkmap], "Xtestout")',
\ 'qall', \ 'qall',
\ ] \ ]
if has('arabic') && RunVim([], after, '-A') " Use silent Ex mode to avoid the hit-Enter prompt for the warning that
" 'encoding' is not utf-8.
if has('arabic') && &encoding == 'utf-8' && RunVim([], after, '-e -s -A')
let lines = readfile('Xtestout') let lines = readfile('Xtestout')
call assert_equal(['1', '1', '0', '0'], lines) call assert_equal(['1', '1', '0', '0'], lines)
endif endif

2
src/version.c
View File

@@ -794,6 +794,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 */
/**/
409,
/**/ /**/
408, 408,
/**/ /**/