Mercurial > vim
changeset 10162:663ef672c4b9 v7.4.2351
commit https://github.com/vim/vim/commit/ff330ff2c4500dc5535631418d601194654e4536
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Sep 9 15:31:34 2016 +0200
patch 7.4.2351
Problem: Netbeans test fails when run from unpacked MS-Windows sources.
Solution: Open README.txt instead of Makefile.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Fri, 09 Sep 2016 15:45:07 +0200 |
parents | eeb7286ab81e |
children | d745005ad769 |
files | src/testdir/test_netbeans.py src/testdir/test_netbeans.vim src/version.c |
diffstat | 3 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_netbeans.py +++ b/src/testdir/test_netbeans.py @@ -42,10 +42,10 @@ class ThreadedTCPRequestHandler(socketse myfile.write(received) response = '' - if received.find('Makefile') > 0: + if received.find('README.txt') > 0: name = received.split('"')[1] response = '5:putBufferNumber!33 "' + name + '"\n' - response += '5:setDot!1 2/19\n' + response += '5:setDot!1 3/19\n' elif received.find('disconnect') > 0: # we're done self.server.shutdown()
--- a/src/testdir/test_netbeans.vim +++ b/src/testdir/test_netbeans.vim @@ -23,13 +23,13 @@ func Nb_basic(port) call assert_true(has("netbeans_enabled")) call WaitFor('len(readfile("Xnetbeans")) > 2') - split +$ Makefile + split +$ README.txt - " Opening Makefile will result in a setDot command + " 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(2, pos[1]) + call assert_equal(3, pos[1]) call assert_equal(20, pos[2]) close nbclose @@ -39,7 +39,7 @@ func Nb_basic(port) 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:fileOpened=0 "README.txt" T F', substitute(lines[3], '".*/', '"', '')) call assert_equal('0:disconnect=1', lines[6])