# HG changeset patch # User Bram Moolenaar # Date 1664101805 -7200 # Node ID 3d09e9fe748b9c730c4fc2bb75aa42ecaf05eb40 # Parent e1816c2fad0c06daf32c434f3ee8511e8ab081df patch 9.0.0582: channel cwd test fails on Cirrus CI Commit: https://github.com/vim/vim/commit/ec1238b4068d0d6d9d02ac1a8e61720224a1be73 Author: Bram Moolenaar Date: Sun Sep 25 11:21:04 2022 +0100 patch 9.0.0582: channel cwd test fails on Cirrus CI Problem: Channel cwd test fails on Cirrus CI. Solution: Also remove /private from the expected directory. diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim --- a/src/testdir/test_channel.vim +++ b/src/testdir/test_channel.vim @@ -1989,8 +1989,13 @@ func Test_cwd() 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 diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -700,6 +700,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 582, +/**/ 581, /**/ 580,