commit c212dd0a346d57f62013094ea6861eb28e33023c
author Bram Moolenaar <Bram@vim.org> Sun Jul 12 20:49:29 2020 +0200
committer Bram Moolenaar <Bram@vim.org> Sun Jul 12 20:49:29 2020 +0200
tree 38f65edf4329fa6c831dc26bb8354f8c89db0c3e
parent 83e7450053399942e1c9efa802c568b51d948541

patch 8.2.1197: clientserver test still fails on MS-Windows

Problem:    Clientserver test still fails on MS-Windows.
Solution:   Expect a different error message.

src/testdir/test_clientserver.vim

diff --git a/src/testdir/test_clientserver.vim b/src/testdir/test_clientserver.vim
index dbd832e..db63ce3 100644
--- a/src/testdir/test_clientserver.vim
+++ b/src/testdir/test_clientserver.vim
@@ -167,9 +167,9 @@
   call assert_fails('call remote_startserver([])', 'E730:')
   call assert_fails("let x = remote_peek([])", 'E730:')
   call assert_fails("let x = remote_read('vim10')",
-        \ [has('unix') ? 'E573:.*vim10' : 'E277:.*vim10'])
+        \ has('unix') ? ['E573:.*vim10'] : 'E277:')
   call assert_fails("call server2client('abc', 'xyz')",
-        \ [has('unix') ? 'E573:.*abc' : 'E258:.*abc'])
+        \ has('unix') ? ['E573:.*abc'] : 'E258:')
 endfunc
 
 " Uncomment this line to get a debugging log

src/version.c

diff --git a/src/version.c b/src/version.c
index 34acc6b..19b911e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1197,
+/**/
     1196,
 /**/
     1195,