forked from aniani/vim
patch 8.2.2035: MS-Windows: some tests may fail
Problem: MS-Windows: some tests may fail. Solution: Avoid test failures. (Yegappan Lakshmanan, closes #7346)
This commit is contained in:
@@ -2304,8 +2304,14 @@ endfunc
|
|||||||
func Test_cb_with_input()
|
func Test_cb_with_input()
|
||||||
let g:wait_exit_cb = 1
|
let g:wait_exit_cb = 1
|
||||||
|
|
||||||
call job_start('echo "Vim''s test"',
|
if has('win32')
|
||||||
\ {'out_cb': 'ExitCb_cb_with_input'})
|
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)})
|
call WaitForAssert({-> assert_equal(0, g:wait_exit_cb)})
|
||||||
|
|
||||||
unlet g:wait_exit_cb
|
unlet g:wait_exit_cb
|
||||||
|
@@ -201,6 +201,7 @@ func Test_ex_mode_with_global()
|
|||||||
call assert_equal(1, RunVim([], [], '-e -s -S Xexmodescript'))
|
call assert_equal(1, RunVim([], [], '-e -s -S Xexmodescript'))
|
||||||
call assert_equal(['done'], readfile('Xdidexmode'))
|
call assert_equal(['done'], readfile('Xdidexmode'))
|
||||||
|
|
||||||
|
call delete('logfile')
|
||||||
call delete('Xdidexmode')
|
call delete('Xdidexmode')
|
||||||
call delete('Xexmodescript')
|
call delete('Xexmodescript')
|
||||||
endfunc
|
endfunc
|
||||||
|
@@ -1273,7 +1273,16 @@ endfunc
|
|||||||
func Test_executable_longname()
|
func Test_executable_longname()
|
||||||
CheckMSWindows
|
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 writefile([], fname)
|
||||||
call assert_equal(1, executable(fname))
|
call assert_equal(1, executable(fname))
|
||||||
call delete(fname)
|
call delete(fname)
|
||||||
|
@@ -750,6 +750,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
2035,
|
||||||
/**/
|
/**/
|
||||||
2034,
|
2034,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user