diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-09-27 18:05:38 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-09-27 18:05:38 +0100 |
| commit | 859ea4bc76699232e41aea0f308463bab887b0c1 (patch) | |
| tree | ffa64ac28fbeb67cc0c95ac75bd64b7089f24473 | |
| parent | 66000ff9af8e3de93825ce7baa0c43727465eca5 (diff) | |
| download | vim-git-859ea4bc76699232e41aea0f308463bab887b0c1.tar.gz | |
patch 9.0.0610: global interrupt test fails when run under valgrindv9.0.0610
Problem: Global interrupt test fails when run under valgrind.
Solution: Use TermWait().
| -rw-r--r-- | src/testdir/test_global.vim | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/testdir/test_global.vim b/src/testdir/test_global.vim index 75b56e033..1f4cb6a65 100644 --- a/src/testdir/test_global.vim +++ b/src/testdir/test_global.vim @@ -111,6 +111,7 @@ endfunc " Test for interrupting :global using Ctrl-C func Test_interrupt_global() CheckRunVimInTerminal + let lines =<< trim END cnoremap ; <Cmd>sleep 10<CR> call setline(1, repeat(['foo'], 5)) @@ -120,14 +121,14 @@ func Test_interrupt_global() call term_sendkeys(buf, ":g/foo/norm :\<C-V>;\<CR>") " Wait for :sleep to start - call term_wait(buf) + call TermWait(buf, 100) call term_sendkeys(buf, "\<C-C>") call WaitForAssert({-> assert_match('Interrupted', term_getline(buf, 6))}, 1000) " Also test in Ex mode call term_sendkeys(buf, "gQg/foo/norm :\<C-V>;\<CR>") " Wait for :sleep to start - call term_wait(buf) + call TermWait(buf, 100) call term_sendkeys(buf, "\<C-C>") call WaitForAssert({-> assert_match('Interrupted', term_getline(buf, 5))}, 1000) diff --git a/src/version.c b/src/version.c index d32b92687..19a6b5a6d 100644 --- a/src/version.c +++ b/src/version.c @@ -700,6 +700,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 610, +/**/ 609, /**/ 608, |