summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-12-25 13:59:51 +0100
committerBram Moolenaar <Bram@vim.org>2019-12-25 13:59:51 +0100
commit03af01f1cb03423f1a1a6b19f11f0285d81e12c4 (patch)
tree8a7313a489f61cf352acf0f8ad466ce3c65e5c73
parent569fea2c312126dd5a542c4b1aa51095136a2c0d (diff)
downloadvim-git-03af01f1cb03423f1a1a6b19f11f0285d81e12c4.tar.gz
patch 8.2.0040: timers test is still flaky on Travis for Macv8.2.0040
Problem: Timers test is still flaky on Travis for Mac. Solution: Run separately instead of as part of test_alot.
-rw-r--r--src/testdir/Make_all.mak1
-rw-r--r--src/testdir/test_alot.vim1
-rw-r--r--src/version.c2
3 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
index fab1460b6..2cccc8e90 100644
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -429,6 +429,7 @@ NEW_TESTS_RES = \
test_textformat.res \
test_textobjects.res \
test_textprop.res \
+ test_timers.res \
test_trycatch.res \
test_undo.res \
test_user_func.res \
diff --git a/src/testdir/test_alot.vim b/src/testdir/test_alot.vim
index 25241b229..767f587a8 100644
--- a/src/testdir/test_alot.vim
+++ b/src/testdir/test_alot.vim
@@ -64,7 +64,6 @@ source test_tagcase.vim
source test_tagfunc.vim
source test_tagjump.vim
source test_taglist.vim
-source test_timers.vim
source test_true_false.vim
source test_unlet.vim
source test_virtualedit.vim
diff --git a/src/version.c b/src/version.c
index 9f7f48a38..aeadb364f 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 */
/**/
+ 40,
+/**/
39,
/**/
38,