summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-02-18 22:58:26 +0100
committerBram Moolenaar <Bram@vim.org>2016-02-18 22:58:26 +0100
commit922d25f99c6d38e7f9cfca7a53ab841641517ebc (patch)
treec7efcc3a7b07bb7c421f6c8563cc6ec43222967d
parent93bf558caef2d507ef6baf56eaf6025b63da1e34 (diff)
downloadvim-git-922d25f99c6d38e7f9cfca7a53ab841641517ebc.tar.gz
patch 7.4.1353v7.4.1353
Problem: Test_connect_waittime is skipped for MS-Windows. Solution: Add the test back, it works now.
-rw-r--r--src/testdir/test_channel.vim4
-rw-r--r--src/version.c2
2 files changed, 2 insertions, 4 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index f6ec36b35..6b6d7f10a 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -268,10 +268,6 @@ 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
call ch_log('Test_connect_waittime()')
let start = reltime()
let handle = ch_open('localhost:9876', s:chopt)
diff --git a/src/version.c b/src/version.c
index c46e44757..e3d7d1bbb 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 */
/**/
+ 1353,
+/**/
1352,
/**/
1351,