patch 7.4.2093

Problem:    Netbeans test fails once in a while.  Leaving log file behind.
Solution:   Add it to the list of flaky tests.  Disable logfile.

diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index e06e0cbdf9fbff8d1ae5399aa062ac436b051ea7..7f77692886cb2cec1011a9675617c352a627b1d5 100644 (file)
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -125,7 +125,7 @@ else
 endif
 
 " Names of flaky tests.
-let s:flaky = ['Test_reltime()']
+let s:flaky = ['Test_reltime()', 'Test_nb_basic()']
 
 " Locate Test_ functions and execute them.
 set nomore

diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index e00cc502b5627e3f8eaedba56e35fa9faaa46e20..48ab69c75b216024286db46936230c6b8a42592c 100644 (file)
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -1344,4 +1344,4 @@ func Test_close_lambda()
 endfunc
 
 " Uncomment this to see what happens, output is in src/testdir/channellog.
- call ch_logfile('channellog', 'w')
+" call ch_logfile('channellog', 'w')

diff --git a/src/version.c b/src/version.c
index 55054968e3bbfd3a5ef9a9920f8c5f4169dbad62..13c6bfed2d75983302428b8985a842362ea6ae68 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2093,
 /**/
     2092,
 /**/