summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorK.Takata <kentkt@csc.jp>2022-09-07 13:01:11 +0100
committerBram Moolenaar <Bram@vim.org>2022-09-07 13:01:11 +0100
commite68f1348f25766c669e27e1f7da2453c46e4c981 (patch)
treef5886fc7a2b234ca76ff4c284af248b0bfa0078f
parent98aff658d5f97629d7c3a9fccac6c79fc9c6029d (diff)
downloadvim-git-e68f1348f25766c669e27e1f7da2453c46e4c981.tar.gz
patch 9.0.0400: GUI test sometimes hangs on CIv9.0.0400
Problem: GUI test sometimes hangs on CI. Solution: Delete a test file explicitly. (Ken Takata, closes #11072)
-rw-r--r--src/testdir/test_gui.vim6
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim
index a2491458d..b9b6bd8df 100644
--- a/src/testdir/test_gui.vim
+++ b/src/testdir/test_gui.vim
@@ -1607,12 +1607,15 @@ func Test_gui_CTRL_SHIFT_V()
endfunc
func Test_gui_dialog_file()
+ " make sure the file does not exist, otherwise a dialog makes Vim hang
+ call delete('Xdialfile')
+
let lines =<< trim END
file Xdialfile
normal axxx
confirm qa
END
- call writefile(lines, 'Xlines')
+ call writefile(lines, 'Xlines', 'D')
let prefix = '!'
if has('win32')
let prefix = '!start '
@@ -1624,7 +1627,6 @@ func Test_gui_dialog_file()
call delete('Xdialog')
call delete('Xdialfile')
- call delete('Xlines')
endfunc
" Test for sending low level key presses
diff --git a/src/version.c b/src/version.c
index 025b5763a..a46236ac1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 400,
+/**/
399,
/**/
398,