Skip to content

Commit ff330ff

Browse files
committed
patch 7.4.2351
Problem: Netbeans test fails when run from unpacked MS-Windows sources. Solution: Open README.txt instead of Makefile.
1 parent cf703fe commit ff330ff

3 files changed

Lines changed: 8 additions & 6 deletions

File tree

src/testdir/test_netbeans.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ def handle(self):
4242
myfile.write(received)
4343

4444
response = ''
45-
if received.find('Makefile') > 0:
45+
if received.find('README.txt') > 0:
4646
name = received.split('"')[1]
4747
response = '5:putBufferNumber!33 "' + name + '"\n'
48-
response += '5:setDot!1 2/19\n'
48+
response += '5:setDot!1 3/19\n'
4949
elif received.find('disconnect') > 0:
5050
# we're done
5151
self.server.shutdown()

src/testdir/test_netbeans.vim

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ func Nb_basic(port)
2323
call assert_true(has("netbeans_enabled"))
2424

2525
call WaitFor('len(readfile("Xnetbeans")) > 2')
26-
split +$ Makefile
26+
split +$ README.txt
2727

28-
" Opening Makefile will result in a setDot command
28+
" Opening README.txt will result in a setDot command
2929
call WaitFor('len(readfile("Xnetbeans")) > 4')
3030
call WaitFor('getcurpos()[1] == 2')
3131
let pos = getcurpos()
32-
call assert_equal(2, pos[1])
32+
call assert_equal(3, pos[1])
3333
call assert_equal(20, pos[2])
3434
close
3535
nbclose
@@ -39,7 +39,7 @@ func Nb_basic(port)
3939
call assert_equal('AUTH bunny', lines[0])
4040
call assert_equal('0:version=0 "2.5"', lines[1])
4141
call assert_equal('0:startupDone=0', lines[2])
42-
call assert_equal('0:fileOpened=0 "Makefile" T F', substitute(lines[3], '".*/', '"', ''))
42+
call assert_equal('0:fileOpened=0 "README.txt" T F', substitute(lines[3], '".*/', '"', ''))
4343

4444
call assert_equal('0:disconnect=1', lines[6])
4545

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -763,6 +763,8 @@ static char *(features[]) =
763763

764764
static int included_patches[] =
765765
{ /* Add new patch number below this line */
766+
/**/
767+
2351,
766768
/**/
767769
2350,
768770
/**/

0 commit comments

Comments
 (0)