changeset 18836:7882ccab03da v8.1.2405

patch 8.1.2405: matchadd_conceal test fails under valgrind Commit: https://github.com/vim/vim/commit/1f9a028def327bd9bbfef375cb1283cd51e04678 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Dec 7 17:22:04 2019 +0100 patch 8.1.2405: matchadd_conceal test fails under valgrind Problem: matchadd_conceal test fails under valgrind. Solution: Use WaitForAssert() and wait a bit longer.
author Bram Moolenaar <Bram@vim.org>
date Sat, 07 Dec 2019 17:30:03 +0100
parents 2a003127554e
children 00e789ecc516
files src/testdir/test_matchadd_conceal.vim src/version.c
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_matchadd_conceal.vim
+++ b/src/testdir/test_matchadd_conceal.vim
@@ -298,12 +298,14 @@ func Test_cursor_column_in_concealed_lin
   END
   call writefile(lines, 'Xcolesearch')
   let buf = RunVimInTerminal('Xcolesearch', {})
+  call term_wait(buf, 100)
 
   " Jump to something that is beyond the bottom of the window,
   " so there's a scroll down.
   call term_sendkeys(buf, ":so %\<CR>")
+  call term_wait(buf, 100)
   call term_sendkeys(buf, "/expr\<CR>")
-  call term_wait(buf)
+  call term_wait(buf, 100)
 
   " Are the concealed parts of the current line really hidden?
   let cursor_row = term_scrape(buf, '.')->map({_, e -> e.chars})->join('')
@@ -336,7 +338,7 @@ func Test_cursor_column_in_concealed_lin
   call term_wait(buf)
 
   " Are the concealed parts of the current line really hidden?
-  call assert_equal('c', term_getline(buf, '.'))
+  call WaitForAssert({-> assert_equal('c', term_getline(buf, '.'))})
 
   " BugFix check: Is the window's cursor column properly updated for conceal?
   call assert_equal(1, term_getcursor(buf)[1])
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2405,
+/**/
     2404,
 /**/
     2403,