Mercurial > vim
changeset 30493:3d09e9fe748b v9.0.0582
patch 9.0.0582: channel cwd test fails on Cirrus CI
Commit: https://github.com/vim/vim/commit/ec1238b4068d0d6d9d02ac1a8e61720224a1be73
Author: Bram Moolenaar <Bram@vim.org>
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.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 25 Sep 2022 12:30:05 +0200 |
| parents | e1816c2fad0c |
| children | da5b1319492b |
| files | src/testdir/test_channel.vim src/version.c |
| diffstat | 2 files changed, 7 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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