aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.0071: memory test often fails on Cirrus CI

Browse Source 
Problem:    Memory test often fails on Cirrus CI.
Solution:   Allow for more tolerance in the upper limit.  Remove sleep.
This commit is contained in:
Bram Moolenaar 2020-01-01 15:17:25 +01:00
parent d518f952f0
commit 1832d12aea
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/testdir/test_memory_usage.vim
View File

@ -133,8 +133,6 @@ func Test_memory_func_capture_lvars()
let vim = s:vim_new() let vim = s:vim_new()
call vim.start('--clean', '-c', 'set noswapfile', testfile) 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 let before = s:monitor_memory_usage(vim.pid).last
call term_sendkeys(vim.buf, ":so %\<CR>") 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%. " 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 " 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 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 assert_inrange(lower, upper, last)
call vim.stop() call vim.stop()

2
src/version.c
View File

@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
71,
/**/ /**/
70, 70,
/**/ /**/