diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-20 21:48:25 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-20 21:48:25 +0100 |
| commit | af7559f66603075e9b4d39d873b2161ea3ec8492 (patch) | |
| tree | 8c437a5d2bfaa266902821c7498d831a2180281f | |
| parent | ece61b06ef4726515177c9b293e1c20d2122a73f (diff) | |
| download | vim-git-af7559f66603075e9b4d39d873b2161ea3ec8492.tar.gz | |
patch 7.4.1374v7.4.1374
Problem: Channel test hangs on MS-Windows.
Solution: Disable the ch_read() that is supposed to time out.
| -rw-r--r-- | src/testdir/test_channel.vim | 15 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 11 insertions, 6 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim index 4d3b35914..3d9f6d028 100644 --- a/src/testdir/test_channel.vim +++ b/src/testdir/test_channel.vim @@ -185,12 +185,15 @@ func s:communicate(port) call assert_equal('ok', ch_sendexpr(handle, 'empty-request')) " Reading while there is nothing available. - call assert_equal(v:none, ch_read(handle, {'timeout': 0})) - let start = reltime() - call assert_equal(v:none, ch_read(handle, {'timeout': 333})) - let elapsed = reltime(start) - call assert_true(reltimefloat(elapsed) > 0.3) - call assert_true(reltimefloat(elapsed) < 0.6) + " TODO: make this work for MS-Windows + if has('unix') + call assert_equal(v:none, ch_read(handle, {'timeout': 0})) + let start = reltime() + call assert_equal(v:none, ch_read(handle, {'timeout': 333})) + let elapsed = reltime(start) + call assert_true(reltimefloat(elapsed) > 0.3) + call assert_true(reltimefloat(elapsed) < 0.6) + endif " Send without waiting for a response, then wait for a response. call ch_sendexpr(handle, 'wait a bit', {'callback': 0}) diff --git a/src/version.c b/src/version.c index 5b8374bd7..19680dd0a 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 */ /**/ + 1374, +/**/ 1373, /**/ 1372, |