Patch 8.2.2035

4 views
Skip to first unread message

Bram Moolenaar

unread,
Nov 23, 2020, 2:27:31 PM11/23/20
to vim...@googlegroups.com

Patch 8.2.2035
Problem: MS-Windows: some tests may fail.
Solution: Avoid test failures. (Yegappan Lakshmanan, closes #7346)
Files: src/testdir/test_channel.vim, src/testdir/test_ex_mode.vim,
src/testdir/test_functions.vim


*** ../vim-8.2.2034/src/testdir/test_channel.vim 2020-11-22 14:23:57.059233488 +0100
--- src/testdir/test_channel.vim 2020-11-23 18:10:49.569783124 +0100
***************
*** 2304,2311 ****
func Test_cb_with_input()
let g:wait_exit_cb = 1

! call job_start('echo "Vim''s test"',
! \ {'out_cb': 'ExitCb_cb_with_input'})
call WaitForAssert({-> assert_equal(0, g:wait_exit_cb)})

unlet g:wait_exit_cb
--- 2304,2317 ----
func Test_cb_with_input()
let g:wait_exit_cb = 1

! 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
*** ../vim-8.2.2034/src/testdir/test_ex_mode.vim 2020-11-01 22:31:05.023982249 +0100
--- src/testdir/test_ex_mode.vim 2020-11-23 18:10:49.569783124 +0100
***************
*** 201,206 ****
--- 201,207 ----
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
*** ../vim-8.2.2034/src/testdir/test_functions.vim 2020-10-11 14:28:07.074402602 +0200
--- src/testdir/test_functions.vim 2020-11-23 18:10:49.569783124 +0100
***************
*** 1273,1279 ****
func Test_executable_longname()
CheckMSWindows

! let fname = 'X' . repeat('あ', 200) . '.bat'
call writefile([], fname)
call assert_equal(1, executable(fname))
call delete(fname)
--- 1273,1288 ----
func Test_executable_longname()
CheckMSWindows

! " 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)
*** ../vim-8.2.2034/src/version.c 2020-11-23 08:31:14.101789113 +0100
--- src/version.c 2020-11-23 18:11:46.933568217 +0100
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 2035,
/**/

--
Not too long ago, a keyboard was something to make music with...

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
Reply all
Reply to author
Forward
0 new messages