summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-06-15 18:08:42 +0100
committerBram Moolenaar <Bram@vim.org>2022-06-15 18:08:42 +0100
commitdad5d2f87b867dab48ac265e3d978d86f0541493 (patch)
tree52994c52b226684becd16b2e50cc4fc083655c8e /src
parent62eb239c1c19ff3e08e492ecf01b1246082a03ac (diff)
downloadvim-git-dad5d2f87b867dab48ac265e3d978d86f0541493.tar.gz
patch 8.2.5100: memory usage tests are not retriedv8.2.5100
Problem: Memory usage tests are not retried. Solution: Mark memory usage tests as flaky.
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_memory_usage.vim3
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/testdir/test_memory_usage.vim b/src/testdir/test_memory_usage.vim
index 3b7b37247..976fcde70 100644
--- a/src/testdir/test_memory_usage.vim
+++ b/src/testdir/test_memory_usage.vim
@@ -65,6 +65,9 @@ func s:term_vim.start(...) abort
let self.job = term_getjob(self.buf)
call WaitFor({-> job_status(self.job) ==# 'run'})
let self.pid = job_info(self.job).process
+
+ " running an external command may fail once in a while
+ let g:test_is_flaky = 1
endfunc
func s:term_vim.stop() abort
diff --git a/src/version.c b/src/version.c
index e9cfe7c2f..74e859552 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 5100,
+/**/
5099,
/**/
5098,