summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-12-25 15:47:14 +0100
committerBram Moolenaar <Bram@vim.org>2019-12-25 15:47:14 +0100
commit818fed7a5ea1f1b11493557989a689ff163051e9 (patch)
tree001390b503d6a7c9c3f43c05a661a7dbee76541c
parenteac7ce01e92f3dee6bbccaf7e88680fe2ce286eb (diff)
downloadvim-git-818fed7a5ea1f1b11493557989a689ff163051e9.tar.gz
patch 8.2.0043: timers test is still flaky on Travis for Macv8.2.0043
Problem: Timers test is still flaky on Travis for Mac. Solution: Increase maximum expected time.
-rw-r--r--src/testdir/test_timers.vim4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim
index a5df4b1b5..78676d211 100644
--- a/src/testdir/test_timers.vim
+++ b/src/testdir/test_timers.vim
@@ -20,8 +20,8 @@ func Test_timer_oneshot()
let slept = WaitFor('g:val == 1')
call assert_equal(1, g:val)
if has('mac')
- " Mac on Travis can be slow.
- let limit = 160
+ " Mac on Travis can be very slow.
+ let limit = 180
else
let limit = 100
endif
diff --git a/src/version.c b/src/version.c
index d4760ebf3..044fe0828 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 43,
+/**/
42,
/**/
41,