diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/test_channel.vim | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim index fc8b3729ab..a2dafb5600 100644 --- a/src/testdir/test_channel.vim +++ b/src/testdir/test_channel.vim @@ -1174,8 +1174,13 @@ func Test_out_cb() " Receive a json object split in pieces let g:Ch_outobj = '' call ch_sendraw(job, "echosplit [0, {\"one\": 1,| \"tw|o\": 2, \"three\": 3|}]\n") - " For unknown reason this can be very slow on Mac. - call WaitForAssert({-> assert_equal({'one': 1, 'two': 2, 'three': 3}, g:Ch_outobj)}, 10000) + " For unknown reasons this can be very slow on Mac. + if has('mac') + let timeout = 20000 + else + let timeout = 5000 + endif + call WaitForAssert({-> assert_equal({'one': 1, 'two': 2, 'three': 3}, g:Ch_outobj)}, timeout) finally call job_stop(job) endtry diff --git a/src/version.c b/src/version.c index d06b4b7771..69afadf0d9 100644 --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 475, +/**/ 474, /**/ 473, |