diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-07-12 20:00:24 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-07-12 20:00:24 +0200 |
| commit | 4d57ba02029071e5947a54766e9f5d42e3bb3008 (patch) | |
| tree | d3abbb361453343a10d73892e4cf9d9a44164095 | |
| parent | a4dc6f92bb29b00783f8945bbe1101e837b6ad3c (diff) | |
| download | vim-git-4d57ba02029071e5947a54766e9f5d42e3bb3008.tar.gz | |
patch 8.2.1195: clientserver test fails on MS-Windowsv8.2.1195
Problem: Clientserver test fails on MS-Windows.
Solution: Expect a different error message.
| -rw-r--r-- | src/testdir/test_clientserver.vim | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/testdir/test_clientserver.vim b/src/testdir/test_clientserver.vim index eb9fcb800..dbd832eba 100644 --- a/src/testdir/test_clientserver.vim +++ b/src/testdir/test_clientserver.vim @@ -166,8 +166,10 @@ func Test_client_server() call assert_fails('call remote_startserver([])', 'E730:') call assert_fails("let x = remote_peek([])", 'E730:') - call assert_fails("let x = remote_read('vim10')", ['E573:.*vim10']) - call assert_fails("call server2client('abc', 'xyz')", ['E573:.*abc']) + call assert_fails("let x = remote_read('vim10')", + \ [has('unix') ? 'E573:.*vim10' : 'E277:.*vim10']) + call assert_fails("call server2client('abc', 'xyz')", + \ [has('unix') ? 'E573:.*abc' : 'E258:.*abc']) endfunc " Uncomment this line to get a debugging log diff --git a/src/version.c b/src/version.c index 68c6db4d5..b7555b723 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1195, +/**/ 1194, /**/ 1193, |