Mercurial > vim
changeset 22977:515d1651c6c6 v8.2.2035
patch 8.2.2035: MS-Windows: some tests may fail
Commit: https://github.com/vim/vim/commit/f637bceb6135139dc1891a15de8fa134c2ca2d97
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Nov 23 18:14:56 2020 +0100
patch 8.2.2035: MS-Windows: some tests may fail
Problem: MS-Windows: some tests may fail.
Solution: Avoid test failures. (Yegappan Lakshmanan, closes https://github.com/vim/vim/issues/7346)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 23 Nov 2020 18:30:04 +0100 |
| parents | a6247a43f345 |
| children | 088b92f86b6c |
| files | src/testdir/test_channel.vim src/testdir/test_ex_mode.vim src/testdir/test_functions.vim src/version.c |
| diffstat | 4 files changed, 21 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_channel.vim +++ b/src/testdir/test_channel.vim @@ -2304,8 +2304,14 @@ endfunc func Test_cb_with_input() let g:wait_exit_cb = 1 - call job_start('echo "Vim''s test"', - \ {'out_cb': 'ExitCb_cb_with_input'}) + if has('win32') + let cmd = 'cmd /c echo "Vim''s test"' + else + let cmd = 'echo "Vim''s test"' + endif + + let job = job_start(cmd, {'out_cb': 'ExitCb_cb_with_input'}) + call WaitFor({-> job_status(job) == "dead"}) call WaitForAssert({-> assert_equal(0, g:wait_exit_cb)}) unlet g:wait_exit_cb
--- a/src/testdir/test_ex_mode.vim +++ b/src/testdir/test_ex_mode.vim @@ -201,6 +201,7 @@ func Test_ex_mode_with_global() call assert_equal(1, RunVim([], [], '-e -s -S Xexmodescript')) call assert_equal(['done'], readfile('Xdidexmode')) + call delete('logfile') call delete('Xdidexmode') call delete('Xexmodescript') endfunc
--- a/src/testdir/test_functions.vim +++ b/src/testdir/test_functions.vim @@ -1273,7 +1273,16 @@ endfunc func Test_executable_longname() CheckMSWindows - let fname = 'X' . repeat('あ', 200) . '.bat' + " Create a temporary .bat file with 205 characters in the name. + " Maximum length of a filename (including the path) on MS-Windows is 259 + " characters. + " See https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation + let len = 259 - getcwd()->len() - 6 + if len > 200 + let len = 200 + endif + + let fname = 'X' . repeat('あ', len) . '.bat' call writefile([], fname) call assert_equal(1, executable(fname)) call delete(fname)