summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-03-20 22:45:01 +0100
committerBram Moolenaar <Bram@vim.org>2019-03-20 22:45:01 +0100
commit08cda65ddfbb4bce8cef43726a0c00817fc47327 (patch)
treef79114d29360e710aaeb12ea23a38588f4988a5a
parentd00e024d9f2b631226c1dba83cb203739b0d02a3 (diff)
downloadvim-git-08cda65ddfbb4bce8cef43726a0c00817fc47327.tar.gz
patch 8.1.1027: memory usage test sometimes failsv8.1.1027
Problem: Memory usage test sometimes fails. Solution: Use 80% of before.last as the lower limit. (Christian Brabandt)
-rw-r--r--src/testdir/test_memory_usage.vim4
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/testdir/test_memory_usage.vim b/src/testdir/test_memory_usage.vim
index 23dcc62ac..b70d2d03f 100644
--- a/src/testdir/test_memory_usage.vim
+++ b/src/testdir/test_memory_usage.vim
@@ -137,7 +137,9 @@ func Test_memory_func_capture_lvars()
let last = s:monitor_memory_usage(vim.pid).last
endfor
- call assert_inrange(before, after.max + (after.last - before), last)
+ " The usage may be a bit less than the last value
+ let lower = before * 8 / 10
+ call assert_inrange(lower, after.max + (after.last - before), last)
call vim.stop()
call delete(testfile)
diff --git a/src/version.c b/src/version.c
index 6b578c828..ee8a4d6dd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -780,6 +780,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1027,
+/**/
1026,
/**/
1025,