summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-02-03 15:38:42 +0100
committerBram Moolenaar <Bram@vim.org>2018-02-03 15:38:42 +0100
commit8dce6c54c81f13582617db3127071b3436b8163b (patch)
treeacb55613a403ae548bc3bbbdb7bfe72ce8a4db02
parent4bfa8af14142e54f509048239f4e8596911f56aa (diff)
patch 8.0.1456: timer test on travis Mac is still flakyv8.0.1456
Problem: Timer test on travis Mac is still flaky. Solution: Increase time range a bit more.
-rw-r--r--src/testdir/test_timers.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim
index 55f5245f3c..df42b2c2b2 100644
--- a/src/testdir/test_timers.vim
+++ b/src/testdir/test_timers.vim
@@ -124,7 +124,7 @@ func Test_paused()
if has('reltime')
if has('mac')
" The travis Mac machines appear to be very busy.
- call assert_inrange(0, 40, slept)
+ call assert_inrange(0, 50, slept)
else
call assert_inrange(0, 30, slept)
endif
diff --git a/src/version.c b/src/version.c
index 69ba3f505e..bb43796073 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1456,
+/**/
1455,
/**/
1454,