summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-08-28 13:38:43 +0100
committerBram Moolenaar <Bram@vim.org>2022-08-28 13:38:43 +0100
commit00d4ceeccafb36f1337d133489b3651c11e78c30 (patch)
tree0f16840449dcfc2a5fcad4b648087df11b98a101
parent43568648dfefe5796dc3fe8fe711135eb20d9eb6 (diff)
patch 9.0.0295: GUI drop files test sometimes failsv9.0.0295
Problem: GUI drop files test sometimes fails. Solution: Mark the test as flaky.
-rw-r--r--src/testdir/test_gui.vim3
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim
index 1fadd5eaed..4856ae3248 100644
--- a/src/testdir/test_gui.vim
+++ b/src/testdir/test_gui.vim
@@ -1430,9 +1430,12 @@ func Test_gui_drop_files()
%bw!
%argdelete
call delete('Xdir1', 'rf')
+
" drop files in the command line. The GUI drop files adds the file names to
" the low level input buffer. So need to use a cmdline map and feedkeys()
" with 'Lx!' to process it in this function itself.
+ " This sometimes fails, e.g. when using valgrind.
+ let g:test_is_flaky = 1
cnoremap <expr> <buffer> <F4> DropFilesInCmdLine()
call feedkeys(":\"\<F4>\<CR>", 'xt')
call feedkeys('k', 'Lx!')
diff --git a/src/version.c b/src/version.c
index afb61e0b3f..280fcff46a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -708,6 +708,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 295,
+/**/
294,
/**/
293,