To: vim_dev@googlegroups.com Subject: Patch 9.0.0610 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.0610 Problem: Global interrupt test fails when run under valgrind. Solution: Use TermWait(). Files: src/testdir/test_global.vim *** ../vim-9.0.0609/src/testdir/test_global.vim 2022-07-26 17:48:09.912150777 +0100 --- src/testdir/test_global.vim 2022-09-27 18:03:35.275348142 +0100 *************** *** 111,116 **** --- 111,117 ---- " 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,133 **** call term_sendkeys(buf, ":g/foo/norm :\;\") " Wait for :sleep to start ! call term_wait(buf) 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 term_sendkeys(buf, "\") call WaitForAssert({-> assert_match('Interrupted', term_getline(buf, 5))}, 1000) --- 121,134 ---- call term_sendkeys(buf, ":g/foo/norm :\;\") " Wait for :sleep to start ! 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 TermWait(buf, 100) call term_sendkeys(buf, "\") call WaitForAssert({-> assert_match('Interrupted', term_getline(buf, 5))}, 1000) *** ../vim-9.0.0609/src/version.c 2022-09-27 17:47:09.336830388 +0100 --- src/version.c 2022-09-27 18:05:14.403121960 +0100 *************** *** 701,702 **** --- 701,704 ---- { /* Add new patch number below this line */ + /**/ + 610, /**/ -- Some of the well known MS-Windows errors: ETIME Wrong time, wait a little while ECRASH Try again... EDETECT Unable to detect errors EOVER You lost! Play another game? ENOCLUE Eh, what did you want? /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///