From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 23 Jul 2016 12:01:15 +0000 (+0200)
Subject: patch 7.4.2093
X-Git-Tag: v7.4.2093
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a58c58b7e1404bb91d59d14539b41390284e7026;p=vim

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 e06e0cbdf..7f7769288 100644
--- 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 e00cc502b..48ab69c75 100644
--- 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 55054968e..13c6bfed2 100644
--- 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,
 /**/