# HG changeset patch # User Christian Brabandt # Date 1470504605 -7200 # Node ID 103ad8a18ebcc66c5d5352e9048a9702b6979cbd # Parent ba20d98a0400aa5c30a82535504d6f338658d8be commit https://github.com/vim/vim/commit/83b3c3d8a0fa1afed06c13163b9f72c0925f2a61 Author: Bram Moolenaar Date: Sat Aug 6 19:16:43 2016 +0200 patch 7.4.2165 Problem: Startup test fails on MS-Windows. Solution: Don't check output if RunVim() returns zero. diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim --- a/src/testdir/test_startup.vim +++ b/src/testdir/test_startup.vim @@ -36,19 +36,20 @@ func Test_after_comes_later() call mkdir('Xafter/plugin', 'p') call writefile(['let done = 1'], 'Xafter/plugin/later.vim') - call RunVim(before, after) + if RunVim(before, after) - let lines = readfile('Xtestout') - let expected = ['Xbefore.vim', 'here.vim', 'foo.vim', 'later.vim', 'Xafter.vim'] - let found = [] - for line in lines - for one in expected - if line =~ one - call add(found, one) - endif + let lines = readfile('Xtestout') + let expected = ['Xbefore.vim', 'here.vim', 'foo.vim', 'later.vim', 'Xafter.vim'] + let found = [] + for line in lines + for one in expected + if line =~ one + call add(found, one) + endif + endfor endfor - endfor - call assert_equal(expected, found) + call assert_equal(expected, found) + endif call delete('Xtestout') call delete('Xhere', 'rf') diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2165, +/**/ 2164, /**/ 2163,