patch 9.0.0295: GUI drop files test sometimes fails

Problem:    GUI drop files test sometimes fails.
Solution:   Mark the test as flaky.

diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim
index 1fadd5eaed6f6641096afa247db8ca3a0ff5bfc7..4856ae3248ec8a3817c949c94a3aaab380ff7022 100644 (file)
--- 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 afb61e0b3f4ef1396361756ae7fed920d7260315..280fcff46a56f66b18a0a7f506e35a4b69268b49 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -707,6 +707,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    295,
 /**/
     294,
 /**/