summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-08-28 16:06:05 +0200
committerBram Moolenaar <Bram@vim.org>2016-08-28 16:06:05 +0200
commit0426bae2abede764d0dd366a28663d1c6e6ab0fe (patch)
treee108267527c420aac2fd74509a6cd132b27ba64f
parente999782e369999539a1783a7ebe4eadcc6da28a8 (diff)
patch 7.4.2281v7.4.2281
Problem: Timer test fails sometimes. Solution: Reduce minimum time by 1 msec.
-rw-r--r--src/testdir/test_timers.vim6
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim
index 70a41e90fd..152f725021 100644
--- a/src/testdir/test_timers.vim
+++ b/src/testdir/test_timers.vim
@@ -20,7 +20,7 @@ func Test_oneshot()
let slept = WaitFor('g:val == 1')
call assert_equal(1, g:val)
if has('reltime')
- call assert_inrange(50, 100, slept)
+ call assert_inrange(49, 100, slept)
else
call assert_inrange(20, 100, slept)
endif
@@ -32,7 +32,7 @@ func Test_repeat_three()
let slept = WaitFor('g:val == 3')
call assert_equal(3, g:val)
if has('reltime')
- call assert_inrange(150, 250, slept)
+ call assert_inrange(149, 250, slept)
else
call assert_inrange(80, 200, slept)
endif
@@ -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, 130, slept)
+ call assert_inrange(49, 130, slept)
else
call assert_inrange(20, 100, slept)
endif
diff --git a/src/version.c b/src/version.c
index 8bca417533..afe9c981cd 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 */
/**/
+ 2281,
+/**/
2280,
/**/
2279,