summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-11-14 20:57:20 +0100
committerBram Moolenaar <Bram@vim.org>2020-11-14 20:57:20 +0100
commita065a141156c8c4017e21dfc9b99a05cfd0b63d6 (patch)
tree98c1bbde3b375ac49a8a8dcd0537f951120e8486
parent02764713a715c55e316e2bef5c9ade2fb767ee78 (diff)
downloadvim-git-a065a141156c8c4017e21dfc9b99a05cfd0b63d6.tar.gz
patch 8.2.1986: expression test is flaky on Appveyorv8.2.1986
Problem: Expression test is flaky on Appveyor. Solution: Temporarily disable the test in MS-Windows.
-rw-r--r--src/testdir/test_vim9_expr.vim13
-rw-r--r--src/version.c2
2 files changed, 10 insertions, 5 deletions
diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim
index 075277221..63bfdd804 100644
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -567,11 +567,14 @@ def Test_expr4_equal()
assert_equal(false, function('g:Test_expr4_equal', [123]) == function('g:Test_expr4_is', [123]))
assert_equal(false, function('g:Test_expr4_equal', [123]) == function('g:Test_expr4_equal', [999]))
- var OneFunc: func
- var TwoFunc: func
- OneFunc = function('len')
- TwoFunc = function('len')
- assert_equal(true, OneFunc('abc') == TwoFunc('123'))
+ # TODO: this unexpectedly sometimes fails on Appveyor
+ if !has('win32')
+ var OneFunc: func
+ var TwoFunc: func
+ OneFunc = function('len')
+ TwoFunc = function('len')
+ assert_equal(true, OneFunc('abc') == TwoFunc('123'))
+ endif
END
CheckDefAndScriptSuccess(lines)
diff --git a/src/version.c b/src/version.c
index 8174386fe..b78e0b59c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1986,
+/**/
1985,
/**/
1984,