To: vim_dev@googlegroups.com Subject: Patch 8.2.5130 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.5130 Problem: Edit test for mode message fails when using valgrind. Solution: Use WaitForAssert(). Run beep test later. Files: src/testdir/test_edit.vim *** ../vim-8.2.5129/src/testdir/test_edit.vim 2022-05-27 17:26:50.546119970 +0100 --- src/testdir/test_edit.vim 2022-06-19 15:20:24.762662477 +0100 *************** *** 1860,1870 **** call writefile(lines, 'Xtest_edit_insertmode_ex_edit') let buf = RunVimInTerminal('-S Xtest_edit_insertmode_ex_edit', #{rows: 6}) ! call TermWait(buf, 50) ! call assert_match('^-- INSERT --\s*$', term_getline(buf, 6)) call term_sendkeys(buf, "\\") ! call TermWait(buf, 50) ! call assert_notmatch('^-- INSERT --\s*$', term_getline(buf, 6)) " clean up call StopVimInTerminal(buf) --- 1860,1868 ---- call writefile(lines, 'Xtest_edit_insertmode_ex_edit') let buf = RunVimInTerminal('-S Xtest_edit_insertmode_ex_edit', #{rows: 6}) ! call WaitForAssert({-> assert_match('^-- INSERT --\s*$', term_getline(buf, 6))}) call term_sendkeys(buf, "\\") ! call WaitForAssert({-> assert_notmatch('^-- INSERT --\s*$', term_getline(buf, 6))}) " clean up call StopVimInTerminal(buf) *************** *** 1872,1885 **** endfunc " Pressing escape in 'insertmode' should beep ! func Test_edit_insertmode_esc_beeps() new set insertmode call assert_beeps("call feedkeys(\"one\\", 'xt')") set insertmode& ! " unsupported CTRL-G command should beep in insert mode. call assert_beeps("normal i\l") ! close! endfunc " Test for 'hkmap' and 'hkmapp' --- 1870,1885 ---- endfunc " Pressing escape in 'insertmode' should beep ! " FIXME: Execute this later, when using valgrind it makes the next test ! " Test_edit_insertmode_ex_edit() fail. ! func Test_z_edit_insertmode_esc_beeps() new set insertmode call assert_beeps("call feedkeys(\"one\\", 'xt')") set insertmode& ! " unsupported "CTRL-G l" command should beep in insert mode. call assert_beeps("normal i\l") ! bwipe! endfunc " Test for 'hkmap' and 'hkmapp' *** ../vim-8.2.5129/src/version.c 2022-06-19 14:36:31.798347408 +0100 --- src/version.c 2022-06-19 15:01:15.839934693 +0100 *************** *** 736,737 **** --- 736,739 ---- { /* Add new patch number below this line */ + /**/ + 5130, /**/ -- OLD WOMAN: Well, how did you become king, then? ARTHUR: The Lady of the Lake, her arm clad in the purest shimmering samite, held Excalibur aloft from the bosom of the water to signify by Divine Providence ... that I, Arthur, was to carry Excalibur ... That is why I am your king! "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// 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 ///