diff options
-rw-r--r-- | src/testdir/test_autocmd.vim | 1 | ||||
-rw-r--r-- | src/testdir/test_buffer.vim | 2 | ||||
-rw-r--r-- | src/testdir/test_bufline.vim | 1 | ||||
-rw-r--r-- | src/testdir/test_profile.vim | 1 | ||||
-rw-r--r-- | src/testdir/test_shell.vim | 5 | ||||
-rw-r--r-- | src/testdir/test_undo.vim | 5 | ||||
-rw-r--r-- | src/testdir/test_viminfo.vim | 2 | ||||
-rw-r--r-- | src/version.c | 2 |
8 files changed, 19 insertions, 0 deletions
diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim index 669089df2d..3370190960 100644 --- a/src/testdir/test_autocmd.vim +++ b/src/testdir/test_autocmd.vim @@ -763,6 +763,7 @@ func Test_autocmd_bufwipe_in_SessLoadPost() call writefile(content, 'Xvimrc', 'D') call system(GetVimCommand('Xvimrc') .. ' --not-a-term --noplugins -S Session.vim -c cq') + sleep 50m let errors = join(readfile('Xerrors')) call assert_match('E814:', errors) diff --git a/src/testdir/test_buffer.vim b/src/testdir/test_buffer.vim index 489926dfbd..9387b5f6c4 100644 --- a/src/testdir/test_buffer.vim +++ b/src/testdir/test_buffer.vim @@ -375,6 +375,7 @@ endfunc func Test_buffer_scheme() CheckMSWindows + set noswapfile set noshellslash %bwipe! let bufnames = [ @@ -397,6 +398,7 @@ func Test_buffer_scheme() endfor set shellslash& + set swapfile& endfunc " this was using a NULL pointer after failing to use the pattern diff --git a/src/testdir/test_bufline.vim b/src/testdir/test_bufline.vim index f3502a3d41..c592877e81 100644 --- a/src/testdir/test_bufline.vim +++ b/src/testdir/test_bufline.vim @@ -83,6 +83,7 @@ func Test_setline_startup() endif call writefile(['call setline(1, "Hello")', 'silent w Xtest', 'q!'], 'Xscript', 'D') call system(cmd) + sleep 50m call assert_equal(['Hello'], readfile('Xtest')) call delete('Xtest') diff --git a/src/testdir/test_profile.vim b/src/testdir/test_profile.vim index 340048e3ca..47ff2a2dd7 100644 --- a/src/testdir/test_profile.vim +++ b/src/testdir/test_profile.vim @@ -53,6 +53,7 @@ func RunProfileFunc(command, declare, assign) \ . ' -c "qall!"') call assert_equal(0, v:shell_error) + sleep 50m let lines = readfile('Xprofile_func.log') " - Foo1() is called 3 times but should be reported as called twice diff --git a/src/testdir/test_shell.vim b/src/testdir/test_shell.vim index a6aa10ea25..1ed4c5ec3e 100644 --- a/src/testdir/test_shell.vim +++ b/src/testdir/test_shell.vim @@ -5,6 +5,11 @@ source check.vim source shared.vim func Test_shell_options() + if has('win32') + " FIXME: This test is flaky on MS-Windows. + let g:test_is_flaky = 1 + endif + " The expected value of 'shellcmdflag', 'shellpipe', 'shellquote', " 'shellredir', 'shellxescape', 'shellxquote' for the supported shells. let shells = [] diff --git a/src/testdir/test_undo.vim b/src/testdir/test_undo.vim index a2f3c01daf..61cab68964 100644 --- a/src/testdir/test_undo.vim +++ b/src/testdir/test_undo.vim @@ -335,6 +335,11 @@ func Test_insert_expr() endfunc func Test_undofile_earlier() + if has('win32') + " FIXME: This test is flaky on MS-Windows. + let g:test_is_flaky = 1 + endif + " Issue #1254 " create undofile with timestamps older than Vim startup time. let t0 = localtime() - 43200 diff --git a/src/testdir/test_viminfo.vim b/src/testdir/test_viminfo.vim index c3ec5b04d2..71017279dd 100644 --- a/src/testdir/test_viminfo.vim +++ b/src/testdir/test_viminfo.vim @@ -722,6 +722,7 @@ func Test_viminfo_file_mark_unloaded_buf() endfunc func Test_viminfo_oldfiles() + set noswapfile let v:oldfiles = [] let lines = [ \ '# comment line', @@ -765,6 +766,7 @@ func Test_viminfo_oldfiles() call assert_equal("/tmp/another.txt", expand("%")) bwipe delmark E + set swapfile& endfunc " Test for storing and restoring buffer list in 'viminfo' diff --git a/src/version.c b/src/version.c index 5fdf817a58..28f7520f90 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 */ /**/ + 415, +/**/ 414, /**/ 413, |