Permalink
Browse files

patch 7.4.2165

Problem:    Startup test fails on MS-Windows.
Solution:   Don't check output if RunVim() returns zero.
  • Loading branch information...
1 parent 66459b7 commit 83b3c3d8a0fa1afed06c13163b9f72c0925f2a61 @brammool brammool committed Aug 6, 2016
Showing with 15 additions and 12 deletions.
  1. +13 −12 src/testdir/test_startup.vim
  2. +2 −0 src/version.c
@@ -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')
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2165,
+/**/
2164,
/**/
2163,

0 comments on commit 83b3c3d

Please sign in to comment.