diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-01-01 15:17:25 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-01-01 15:17:25 +0100 |
| commit | 1832d12aea30f1533f3c461d9e1530d10f66b162 (patch) | |
| tree | 88b7bde5f21555d080e55d39e9e720fcb552b6e1 | |
| parent | d518f952f0812778758b25139308bcf45df6988c (diff) | |
| download | vim-git-1832d12aea30f1533f3c461d9e1530d10f66b162.tar.gz | |
patch 8.2.0071: memory test often fails on Cirrus CIv8.2.0071
Problem: Memory test often fails on Cirrus CI.
Solution: Allow for more tolerance in the upper limit. Remove sleep.
| -rw-r--r-- | src/testdir/test_memory_usage.vim | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/testdir/test_memory_usage.vim b/src/testdir/test_memory_usage.vim index 1e0dd6d03..43f4abcb5 100644 --- a/src/testdir/test_memory_usage.vim +++ b/src/testdir/test_memory_usage.vim @@ -133,8 +133,6 @@ 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>") @@ -150,9 +148,15 @@ func Test_memory_func_capture_lvars() " The usage may be a bit less than the last value, use 80%. " Allow for 20% tolerance at the upper limit. That's very permissive, but - " otherwise the test fails sometimes. + " otherwise the test fails sometimes. On Cirrus CI with FreeBSD we need to + " be even more permissive. + if has('bsd') + let multiplier = 14 + else + let multiplier = 12 + endif let lower = before * 8 / 10 - let upper = (after.max + (after.last - before)) * 12 / 10 + let upper = (after.max + (after.last - before)) * multiplier / 10 call assert_inrange(lower, upper, last) call vim.stop() diff --git a/src/version.c b/src/version.c index 58211bcce..78af80d95 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 */ /**/ + 71, +/**/ 70, /**/ 69, |