diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim index f8cdef4fc..d9ab521f8 100644 --- a/src/testdir/test_channel.vim +++ b/src/testdir/test_channel.vim @@ -1239,10 +1239,15 @@ func Test_out_cb() let g:Ch_outobj = '' call ch_sendraw(job, "echosplit [0, {\"one\": 1,| \"tw|o\": 2, \"three\": 3|}]\n") " For unknown reasons this can be very slow on Mac. - if has('mac') + " Increase the timeout on every run. + if g:run_nr == 1 + let timeout = 5000 + elseif g:run_nr == 2 + let timeout = 10000 + elseif g:run_nr == 3 let timeout = 20000 else - let timeout = 5000 + let timeout = 40000 endif call WaitForAssert({-> assert_equal({'one': 1, 'two': 2, 'three': 3}, g:Ch_outobj)}, timeout) finally diff --git a/src/version.c b/src/version.c index b2f02eca5..368384c9a 100644 --- a/src/version.c +++ b/src/version.c @@ -749,6 +749,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 3834, /**/ 3833, /**/