diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-14 00:19:59 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-14 00:19:59 +0100 |
| commit | 0727d362b4dad83d9fdf1caba074213e77e0aa49 (patch) | |
| tree | a04369a342dcc2d972e481106ae1498259fe138b | |
| parent | fa4bce7dd23e62d5a2fd79c7719969e11d5597aa (diff) | |
patch 7.4.1317v7.4.1317
Problem: MS-Windows: channel test fails.
Solution: Temporarily disable Test_connect_waittime().
| -rw-r--r-- | src/testdir/test_channel.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim index e894c09cc1..0e87899f75 100644 --- a/src/testdir/test_channel.vim +++ b/src/testdir/test_channel.vim @@ -252,6 +252,10 @@ endfunc " Test that trying to connect to a non-existing port fails quickly. func Test_connect_waittime() + if !has('unix') + " TODO: Make this work again for MS-Windows. + return + endif let start = reltime() let handle = ch_open('localhost:9876', s:chopt) if ch_status(handle) == "fail" diff --git a/src/version.c b/src/version.c index 5343c377d9..f1abf12dea 100644 --- a/src/version.c +++ b/src/version.c @@ -748,6 +748,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1317, +/**/ 1316, /**/ 1315, |