summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-12-30 19:59:24 +0100
committerBram Moolenaar <Bram@vim.org>2019-12-30 19:59:24 +0100
commite7538ae997b3983d0c91a886a74ebacedd752164 (patch)
tree95573947eb4471b2f9086efa9fe34ee99b215c8f
parent3fbcc128cbd2311819cc5a7bb89e45669860f008 (diff)
downloadvim-git-e7538ae997b3983d0c91a886a74ebacedd752164.tar.gz
patch 8.2.0062: memory test is flaky on FreeBSDv8.2.0062
Problem: Memory test is flaky on FreeBSD. Solution: Add a short sleep before getting the first size.
-rw-r--r--src/testdir/test_memory_usage.vim2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/testdir/test_memory_usage.vim b/src/testdir/test_memory_usage.vim
index d7c7036ff..1e0dd6d03 100644
--- a/src/testdir/test_memory_usage.vim
+++ b/src/testdir/test_memory_usage.vim
@@ -133,6 +133,8 @@ func Test_memory_func_capture_lvars()
let vim = s:vim_new()
call vim.start('--clean', '-c', 'set noswapfile', testfile)
+ " Wait a bit until the process has started and sourced the script.
+ sleep 200m
let before = s:monitor_memory_usage(vim.pid).last
call term_sendkeys(vim.buf, ":so %\<CR>")
diff --git a/src/version.c b/src/version.c
index f68e29fe4..d40cb3b4d 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 */
/**/
+ 62,
+/**/
61,
/**/
60,