diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-09-25 11:21:04 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-09-25 11:21:04 +0100 |
| commit | ec1238b4068d0d6d9d02ac1a8e61720224a1be73 (patch) | |
| tree | efe3169902fdd4bc9eb2c57383ba849066b24a42 | |
| parent | d4566c14e71c55dcef05fb34ea94eba835831527 (diff) | |
patch 9.0.0582: channel cwd test fails on Cirrus CIv9.0.0582
Problem: Channel cwd test fails on Cirrus CI.
Solution: Also remove /private from the expected directory.
| -rw-r--r-- | src/testdir/test_channel.vim | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim index 5e1127e5e7..a13b49f463 100644 --- 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 0acc0d4065..79dda65a37 100644 --- 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, |