diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-08-06 19:16:43 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-08-06 19:16:43 +0200 |
| commit | 83b3c3d8a0fa1afed06c13163b9f72c0925f2a61 (patch) | |
| tree | 88657f275142a6e7b63c98ceacf94fec29f85f7f | |
| parent | 66459b7c98c67f8a9d39de8f08e8e8f1fca0e359 (diff) | |
patch 7.4.2165v7.4.2165
Problem: Startup test fails on MS-Windows.
Solution: Don't check output if RunVim() returns zero.
| -rw-r--r-- | src/testdir/test_startup.vim | 25 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 15 insertions, 12 deletions
diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim index 26e7b9f8ee..da6a3f6f80 100644 --- 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) - - 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 + 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 + 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 index 142801db42..e3ecd93c76 100644 --- 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, |