commit 859ea4bc76699232e41aea0f308463bab887b0c1
author Bram Moolenaar <Bram@vim.org> Tue Sep 27 18:05:38 2022 +0100
committer Bram Moolenaar <Bram@vim.org> Tue Sep 27 18:05:38 2022 +0100
tree ffa64ac28fbeb67cc0c95ac75bd64b7089f24473
parent 66000ff9af8e3de93825ce7baa0c43727465eca5

patch 9.0.0610: global interrupt test fails when run under valgrind

Problem:    Global interrupt test fails when run under valgrind.
Solution:   Use TermWait().

src/testdir/test_global.vim

diff --git a/src/testdir/test_global.vim b/src/testdir/test_global.vim
index 75b56e0..1f4cb6a 100644
--- a/src/testdir/test_global.vim
+++ b/src/testdir/test_global.vim
@@ -111,6 +111,7 @@
 " 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 @@
 
   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)
 

src/version.c

diff --git a/src/version.c b/src/version.c
index d32b926..19a6b5a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    610,
+/**/
     609,
 /**/
     608,