diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-12-07 17:22:04 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-12-07 17:22:04 +0100 |
| commit | 1f9a028def327bd9bbfef375cb1283cd51e04678 (patch) | |
| tree | 2a758da9c51dce6b56616b7088828115b5c799fd | |
| parent | 08d2e795e72837a015e69894fb8ebd178e4014c9 (diff) | |
patch 8.1.2405: matchadd_conceal test fails under valgrindv8.1.2405
Problem: matchadd_conceal test fails under valgrind.
Solution: Use WaitForAssert() and wait a bit longer.
| -rw-r--r-- | src/testdir/test_matchadd_conceal.vim | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/testdir/test_matchadd_conceal.vim b/src/testdir/test_matchadd_conceal.vim index 25bff3dead..7c02087e23 100644 --- a/src/testdir/test_matchadd_conceal.vim +++ b/src/testdir/test_matchadd_conceal.vim @@ -298,12 +298,14 @@ func Test_cursor_column_in_concealed_line_after_window_scroll() 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_line_after_leftcol_change() 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]) diff --git a/src/version.c b/src/version.c index 53b9538c17..89896e5a1a 100644 --- 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, |