diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-08-22 22:47:45 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-08-22 22:47:45 +0200 |
| commit | 17f1347b867cbcc0ce380bf9a2466b4c31896f04 (patch) | |
| tree | 4fc680b57df61a24bb0d52bb9fcddd48934b0981 /src | |
| parent | 973365dcc40a41e6b72ece56f15cebfee69b1329 (diff) | |
patch 7.4.2242v7.4.2242
Problem: Timer test sometimes fails.
Solution: Increase the maximum time for callback timer test.
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/test_timers.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim index 344de1f0a3..70a41e90fd 100644 --- a/src/testdir/test_timers.vim +++ b/src/testdir/test_timers.vim @@ -57,7 +57,7 @@ func Test_with_partial_callback() let slept = WaitFor('g:val == 1') call assert_equal(1, g:val) if has('reltime') - call assert_inrange(50, 100, slept) + call assert_inrange(50, 130, slept) else call assert_inrange(20, 100, slept) endif diff --git a/src/version.c b/src/version.c index 6ddcea6e05..70bed2c7cf 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2242, +/**/ 2241, /**/ 2240, |