changeset 9780:103ad8a18ebc v7.4.2165

commit https://github.com/vim/vim/commit/83b3c3d8a0fa1afed06c13163b9f72c0925f2a61 Author: Bram Moolenaar <Bram@vim.org> 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.
author Christian Brabandt <cb@256bit.org>
date Sat, 06 Aug 2016 19:30:05 +0200
parents ba20d98a0400
children b2c1ce80d982
files src/testdir/test_startup.vim src/version.c
diffstat 2 files changed, 14 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- 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')
--- 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,