To: vim_dev@googlegroups.com Subject: Patch 7.4.2165 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.2165 Problem: Startup test fails on MS-Windows. Solution: Don't check output if RunVim() returns zero. Files: src/testdir/test_startup.vim *** ../vim-7.4.2164/src/testdir/test_startup.vim 2016-08-06 19:01:33.984856713 +0200 --- src/testdir/test_startup.vim 2016-08-06 19:14:57.326502111 +0200 *************** *** 36,54 **** 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 endfor ! endfor ! call assert_equal(expected, found) call delete('Xtestout') call delete('Xhere', 'rf') --- 36,55 ---- call mkdir('Xafter/plugin', 'p') call writefile(['let done = 1'], 'Xafter/plugin/later.vim') ! 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 ! call assert_equal(expected, found) ! endif call delete('Xtestout') call delete('Xhere', 'rf') *** ../vim-7.4.2164/src/version.c 2016-08-06 19:01:33.988856681 +0200 --- src/version.c 2016-08-06 19:15:40.118163005 +0200 *************** *** 765,766 **** --- 765,768 ---- { /* Add new patch number below this line */ + /**/ + 2165, /**/ -- Hacker: Someone skilled in computer programming (good guy). Cracker: A hacker that uses his skills to crack software (bad guy). /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///