Skip to content

Commit 83b3c3d

Browse files
committed
patch 7.4.2165
Problem: Startup test fails on MS-Windows. Solution: Don't check output if RunVim() returns zero.
1 parent 66459b7 commit 83b3c3d

2 files changed

Lines changed: 15 additions & 12 deletions

File tree

src/testdir/test_startup.vim

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,20 @@ func Test_after_comes_later()
3636
call mkdir('Xafter/plugin', 'p')
3737
call writefile(['let done = 1'], 'Xafter/plugin/later.vim')
3838

39-
call RunVim(before, after)
40-
41-
let lines = readfile('Xtestout')
42-
let expected = ['Xbefore.vim', 'here.vim', 'foo.vim', 'later.vim', 'Xafter.vim']
43-
let found = []
44-
for line in lines
45-
for one in expected
46-
if line =~ one
47-
call add(found, one)
48-
endif
39+
if RunVim(before, after)
40+
41+
let lines = readfile('Xtestout')
42+
let expected = ['Xbefore.vim', 'here.vim', 'foo.vim', 'later.vim', 'Xafter.vim']
43+
let found = []
44+
for line in lines
45+
for one in expected
46+
if line =~ one
47+
call add(found, one)
48+
endif
49+
endfor
4950
endfor
50-
endfor
51-
call assert_equal(expected, found)
51+
call assert_equal(expected, found)
52+
endif
5253

5354
call delete('Xtestout')
5455
call delete('Xhere', 'rf')

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -763,6 +763,8 @@ static char *(features[]) =
763763

764764
static int included_patches[] =
765765
{ /* Add new patch number below this line */
766+
/**/
767+
2165,
766768
/**/
767769
2164,
768770
/**/

0 commit comments

Comments
 (0)