To: vim_dev@googlegroups.com Subject: Patch 7.4.2351 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.2351 Problem: Netbeans test fails when run from unpacked MS-Windows sources. Solution: Open README.txt instead of Makefile. Files: src/testdir/test_netbeans.py, src/testdir/test_netbeans.vim *** ../vim-7.4.2350/src/testdir/test_netbeans.py 2016-07-15 17:08:45.658711110 +0200 --- src/testdir/test_netbeans.py 2016-09-09 15:27:58.028533727 +0200 *************** *** 42,51 **** myfile.write(received) response = '' ! if received.find('Makefile') > 0: name = received.split('"')[1] response = '5:putBufferNumber!33 "' + name + '"\n' ! response += '5:setDot!1 2/19\n' elif received.find('disconnect') > 0: # we're done self.server.shutdown() --- 42,51 ---- myfile.write(received) response = '' ! if received.find('README.txt') > 0: name = received.split('"')[1] response = '5:putBufferNumber!33 "' + name + '"\n' ! response += '5:setDot!1 3/19\n' elif received.find('disconnect') > 0: # we're done self.server.shutdown() *** ../vim-7.4.2350/src/testdir/test_netbeans.vim 2016-08-27 19:52:43.069912717 +0200 --- src/testdir/test_netbeans.vim 2016-09-09 15:28:11.428352210 +0200 *************** *** 23,35 **** call assert_true(has("netbeans_enabled")) call WaitFor('len(readfile("Xnetbeans")) > 2') ! split +$ Makefile ! " Opening Makefile will result in a setDot command call WaitFor('len(readfile("Xnetbeans")) > 4') call WaitFor('getcurpos()[1] == 2') let pos = getcurpos() ! call assert_equal(2, pos[1]) call assert_equal(20, pos[2]) close nbclose --- 23,35 ---- call assert_true(has("netbeans_enabled")) call WaitFor('len(readfile("Xnetbeans")) > 2') ! split +$ README.txt ! " Opening README.txt will result in a setDot command call WaitFor('len(readfile("Xnetbeans")) > 4') call WaitFor('getcurpos()[1] == 2') let pos = getcurpos() ! call assert_equal(3, pos[1]) call assert_equal(20, pos[2]) close nbclose *************** *** 39,45 **** call assert_equal('AUTH bunny', lines[0]) call assert_equal('0:version=0 "2.5"', lines[1]) call assert_equal('0:startupDone=0', lines[2]) ! call assert_equal('0:fileOpened=0 "Makefile" T F', substitute(lines[3], '".*/', '"', '')) call assert_equal('0:disconnect=1', lines[6]) --- 39,45 ---- call assert_equal('AUTH bunny', lines[0]) call assert_equal('0:version=0 "2.5"', lines[1]) call assert_equal('0:startupDone=0', lines[2]) ! call assert_equal('0:fileOpened=0 "README.txt" T F', substitute(lines[3], '".*/', '"', '')) call assert_equal('0:disconnect=1', lines[6]) *** ../vim-7.4.2350/src/version.c 2016-09-09 14:59:35.211627252 +0200 --- src/version.c 2016-09-09 15:26:39.209601485 +0200 *************** *** 765,766 **** --- 765,768 ---- { /* Add new patch number below this line */ + /**/ + 2351, /**/ -- hundred-and-one symptoms of being an internet addict: 213. Your kids start referring to you as "that guy in front of the monitor." /// 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 ///