# HG changeset patch # User Bram Moolenaar # Date 1664298902 -7200 # Node ID 2c169fec56f2a360763156927213bad32b1b7ab5 # Parent 190885deceac53a962d2049456ce785d2dd4f8da patch 9.0.0610: global interrupt test fails when run under valgrind Commit: https://github.com/vim/vim/commit/859ea4bc76699232e41aea0f308463bab887b0c1 Author: Bram Moolenaar Date: Tue Sep 27 18:05:38 2022 +0100 patch 9.0.0610: global interrupt test fails when run under valgrind Problem: Global interrupt test fails when run under valgrind. Solution: Use TermWait(). diff --git a/src/testdir/test_global.vim b/src/testdir/test_global.vim --- 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 ; sleep 10 call setline(1, repeat(['foo'], 5)) @@ -120,14 +121,14 @@ func Test_interrupt_global() call term_sendkeys(buf, ":g/foo/norm :\;\") " Wait for :sleep to start - call term_wait(buf) + call TermWait(buf, 100) call term_sendkeys(buf, "\") call WaitForAssert({-> assert_match('Interrupted', term_getline(buf, 6))}, 1000) " Also test in Ex mode call term_sendkeys(buf, "gQg/foo/norm :\;\") " Wait for :sleep to start - call term_wait(buf) + call TermWait(buf, 100) call term_sendkeys(buf, "\") call WaitForAssert({-> assert_match('Interrupted', term_getline(buf, 5))}, 1000) diff --git a/src/version.c b/src/version.c --- 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,