diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-07-23 14:01:15 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-07-23 14:01:15 +0200 |
| commit | a58c58b7e1404bb91d59d14539b41390284e7026 (patch) | |
| tree | 0c2587f54949fd18186c1e37667b91320420261f | |
| parent | 870b749ce1db1cec80f0f3766064a031688e6a46 (diff) | |
patch 7.4.2093v7.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.
| -rw-r--r-- | src/testdir/runtest.vim | 2 | ||||
| -rw-r--r-- | src/testdir/test_channel.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim index e06e0cbdf9..7f77692886 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 e00cc502b5..48ab69c75b 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 55054968e3..13c6bfed2d 100644 --- a/src/version.c +++ b/src/version.c @@ -759,6 +759,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2093, +/**/ 2092, /**/ 2091, |