thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.0.0582: channel cwd test fails on Cirrus CI

Browse Source 
Problem:    Channel cwd test fails on Cirrus CI.
Solution:   Also remove /private from the expected directory.
This commit is contained in:
Bram Moolenaar
2022-09-25 11:21:04 +01:00
parent d4566c14e7
commit ec1238b406
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/testdir/test_channel.vim
View File

@@ -1989,8 +1989,13 @@ func Test_cwd()
let job = job_start(cmd, {'callback': {ch,msg -> execute(":let g:envstr .= msg")}, 'cwd': expect}) let job = job_start(cmd, {'callback': {ch,msg -> execute(":let g:envstr .= msg")}, 'cwd': expect})
try try
call WaitForAssert({-> assert_notequal("", g:envstr)}) call WaitForAssert({-> assert_notequal("", g:envstr)})
" There may be a trailing slash or not, ignore it
let expect = substitute(expect, '[/\\]$', '', '') let expect = substitute(expect, '[/\\]$', '', '')
let g:envstr = substitute(g:envstr, '[/\\]$', '', '') 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 if $CI != '' && stridx(g:envstr, '/private/') == 0
let g:envstr = g:envstr[8:] let g:envstr = g:envstr[8:]
endif endif

2
src/version.c
View File

@@ -699,6 +699,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 */
/**/
582,
/**/ /**/
581, 581,
/**/ /**/