Patch 9.0.0582

4 views
Skip to first unread message

Bram Moolenaar

unread,
Sep 25, 2022, 6:22:08 AM9/25/22
to vim...@googlegroups.com

Patch 9.0.0582
Problem: Channel cwd test fails on Cirrus CI.
Solution: Also remove /private from the expected directory.
Files: src/testdir/test_channel.vim


*** ../vim-9.0.0581/src/testdir/test_channel.vim 2022-09-20 11:04:43.705967100 +0100
--- src/testdir/test_channel.vim 2022-09-25 11:18:51.596856346 +0100
***************
*** 1989,1996 ****
--- 1989,2001 ----
let job = job_start(cmd, {'callback': {ch,msg -> execute(":let g:envstr .= msg")}, 'cwd': expect})
try
call WaitForAssert({-> assert_notequal("", g:envstr)})
+ " There may be a trailing slash or not, ignore it
let expect = substitute(expect, '[/\\]$', '', '')
let g:envstr = substitute(g:envstr, '[/\\]$', '', '')
+ " on CI there can be /private prefix or not, ignore it
+ if $CI != '' && stridx(expect, '/private/') == 0
+ let expect = expect[8:]
+ endif
if $CI != '' && stridx(g:envstr, '/private/') == 0
let g:envstr = g:envstr[8:]
endif
*** ../vim-9.0.0581/src/version.c 2022-09-24 21:06:35.408199744 +0100
--- src/version.c 2022-09-25 11:20:03.892516894 +0100
***************
*** 701,702 ****
--- 701,704 ----
{ /* Add new patch number below this line */
+ /**/
+ 582,
/**/

--
"Hit any key to continue" is a lie.

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