changeset 30550:2c169fec56f2 v9.0.0610

patch 9.0.0610: global interrupt test fails when run under valgrind Commit: https://github.com/vim/vim/commit/859ea4bc76699232e41aea0f308463bab887b0c1 Author: Bram Moolenaar <Bram@vim.org> 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().
author Bram Moolenaar <Bram@vim.org>
date Tue, 27 Sep 2022 19:15:02 +0200
parents 190885deceac
children b2b10228a466
files src/testdir/test_global.vim src/version.c
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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)
 
--- 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,