diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-09-19 21:06:31 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-09-19 21:06:31 +0200 |
| commit | 4b1c9a91b5d7f98b6e3391e776a289d485aa274d (patch) | |
| tree | 22f14067627665f18b6f9776d2ad04778e28a921 | |
| parent | a87f8fd3fe8697d2b43da5c89e3079aaa0f1c9c7 (diff) | |
patch 8.1.0409: startup test fails on MS-Windowsv8.1.0409
Problem: Startup test fails on MS-Windows.
Solution: Do the Arabic test in silent Ex mode. Loosen the check for -V2.
| -rw-r--r-- | src/testdir/test_startup.vim | 15 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 13 insertions, 4 deletions
diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim index af7c5c96cd..3fc59bb5b9 100644 --- a/src/testdir/test_startup.vim +++ b/src/testdir/test_startup.vim @@ -252,16 +252,21 @@ func Test_p_arg() call delete('Xtestout') 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() + 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') call assert_equal(" verbose=0\n", out) 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') - 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 " 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")', \ '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') call assert_equal(['1', '1', '0', '0'], lines) endif diff --git a/src/version.c b/src/version.c index 51601a028f..2726e6326f 100644 --- a/src/version.c +++ b/src/version.c @@ -795,6 +795,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 409, +/**/ 408, /**/ 407, |