From 41a834d1e3dbf9c8759737bcd6524159a9b93d2a Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 28 Dec 2020 21:15:16 +0100 Subject: patch 8.2.2240: clientserver test fails if full path is used Problem: Clientserver test fails if full path is used. Solution: Ignore the path preceding the file name. --- src/testdir/test_clientserver.vim | 6 +++--- 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 bfad1b28d3..f838e221ab 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!\") " 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('.*\remote_send(":%bw!\") " Edit a file using --remote-wait eval name->remote_send(":source $VIMRUNTIME/plugin/rrhelper.vim\") call system(cmd .. ' --remote-wait +enew Xfile1') - call assert_equal("Xfile1", remote_expr(name, 'bufname("#")')) + call assert_match('.*\remote_send(":%bw!\") " Edit files using --remote-tab-wait diff --git a/src/version.c b/src/version.c index 1bf9f4903e..39d2f26e15 100644 --- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2240, /**/ 2239, /**/ -- cgit v1.2.3