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
index 5e1127e5e704cb1272375ed1d0c79b3a3084b20e..a13b49f4634d745b1700499ca757abff125722eb 100644 (file)
--- 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
index 0acc0d40651a8fdf095c6f01076f0cc671056f8b..79dda65a3778b155e27c8b923c7f91d3a2a1340b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -699,6 +699,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    582,
 /**/
     581,
 /**/