diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-12-28 21:15:16 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-12-28 21:15:16 +0100 |
| commit | 41a834d1e3dbf9c8759737bcd6524159a9b93d2a (patch) | |
| tree | 0a1d16096f14e723dd33274d60d1eab4ffae58be | |
| parent | dcc58e031ded8b846a39146112b9b075cbb977d9 (diff) | |
| download | vim-git-41a834d1e3dbf9c8759737bcd6524159a9b93d2a.tar.gz | |
patch 8.2.2240: clientserver test fails if full path is usedv8.2.2240
Problem: Clientserver test fails if full path is used.
Solution: Ignore the path preceding the file name.
| -rw-r--r-- | src/testdir/test_clientserver.vim | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/testdir/test_clientserver.vim b/src/testdir/test_clientserver.vim index bfad1b28d..f838e221a 100644 --- a/src/testdir/test_clientserver.vim +++ b/src/testdir/test_clientserver.vim @@ -134,19 +134,19 @@ func Test_client_server() " Edit multiple files using --remote call system(cmd .. ' --remote Xfile1 Xfile2 Xfile3') - call assert_equal("Xfile1\nXfile2\nXfile3\n", remote_expr(name, 'argv()')) + call assert_match(".*Xfile1\n.*Xfile2\n.*Xfile3\n", remote_expr(name, 'argv()')) eval name->remote_send(":%bw!\<CR>") " Edit files in separate tab pages call system(cmd .. ' --remote-tab Xfile1 Xfile2 Xfile3') call WaitForAssert({-> assert_equal('3', remote_expr(name, 'tabpagenr("$")'))}) - call assert_equal('Xfile2', remote_expr(name, 'bufname(tabpagebuflist(2)[0])')) + call assert_match('.*\<Xfile2', remote_expr(name, 'bufname(tabpagebuflist(2)[0])')) eval name->remote_send(":%bw!\<CR>") " Edit a file using --remote-wait eval name->remote_send(":source $VIMRUNTIME/plugin/rrhelper.vim\<CR>") call system(cmd .. ' --remote-wait +enew Xfile1') - call assert_equal("Xfile1", remote_expr(name, 'bufname("#")')) + call assert_match('.*\<Xfile1', remote_expr(name, 'bufname("#")')) eval name->remote_send(":%bw!\<CR>") " Edit files using --remote-tab-wait diff --git a/src/version.c b/src/version.c index 1bf9f4903..39d2f26e1 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2240, +/**/ 2239, /**/ 2238, |