summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-04-08 22:56:34 +0200
committerBram Moolenaar <Bram@vim.org>2020-04-08 22:56:34 +0200
commit25d57009520f0e590920b9f953b1cbbb358e72a2 (patch)
treec4bd7a9e4cb94522f689afbab121df5ef37e1ed2
parent6a2c5a7dd5c9215cc030d5ea6e4616d782c091dd (diff)
downloadvim-git-25d57009520f0e590920b9f953b1cbbb358e72a2.tar.gz
patch 8.2.0534: client-server test fails under valgrindv8.2.0534
Problem: Client-server test fails under valgrind. Solution: Use WaitForAssert().
-rw-r--r--src/testdir/test_clientserver.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_clientserver.vim b/src/testdir/test_clientserver.vim
index 7936227eb..4a48aed91 100644
--- a/src/testdir/test_clientserver.vim
+++ b/src/testdir/test_clientserver.vim
@@ -129,7 +129,7 @@ func Test_client_server()
" Edit files in separate tab pages
call system(cmd .. ' --remote-tab Xfile1 Xfile2 Xfile3')
- call assert_equal('3', remote_expr(name, 'tabpagenr("$")'))
+ call WaitForAssert({-> assert_equal('3', remote_expr(name, 'tabpagenr("$")'))})
call assert_equal('Xfile2', remote_expr(name, 'bufname(tabpagebuflist(2)[0])'))
eval name->remote_send(":%bw!\<CR>")
diff --git a/src/version.c b/src/version.c
index aaa1dc352..2eadd1304 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 534,
+/**/
533,
/**/
532,