diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-07-04 17:23:25 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-07-04 17:23:25 +0200 |
| commit | 3777d6e32b22f0a70b774760c24160079e303bad (patch) | |
| tree | 65a4c54ad2bc87d738bf03a4cc0199be639d254a | |
| parent | 26e88ec8e23fa04e559044199ccb369aed29e570 (diff) | |
patch 8.2.3102: test for crash fix does not fail without the fixv8.2.3102
Problem: Test for crash fix does not fail without the fix.
Solution: Adjust the test sequence. (closes #8506)
| -rw-r--r-- | src/testdir/test_swap.vim | 20 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 14 insertions, 8 deletions
diff --git a/src/testdir/test_swap.vim b/src/testdir/test_swap.vim index 4bc325d333..013b25caac 100644 --- a/src/testdir/test_swap.vim +++ b/src/testdir/test_swap.vim @@ -373,18 +373,22 @@ func Test_swap_prompt_splitwin() call WaitForAssert({-> assert_match('^1$', term_getline(buf, 20))}) call StopVimInTerminal(buf) - " This caused Vim to crash when typing "q". - " TODO: it does not actually reproduce the crash. - call writefile(['au BufAdd * set virtualedit=all'], 'Xvimrc') - - let buf = RunVimInTerminal('-u Xvimrc Xfile1', {'rows': 20, 'wait_for_ruler': 0}) - call TermWait(buf) - call WaitForAssert({-> assert_match('^\[O\]pen Read-Only, (E)dit anyway, (R)ecover, (Q)uit, (A)bort:', term_getline(buf, 20))}) + " This caused Vim to crash when typing "q" at the swap file prompt. + let buf = RunVimInTerminal('-c "au bufadd * let foo_w = wincol()"', {'rows': 18}) + call term_sendkeys(buf, ":e Xfile1\<CR>") + call WaitForAssert({-> assert_match('More', term_getline(buf, 18))}) + call term_sendkeys(buf, " ") + call WaitForAssert({-> assert_match('^\[O\]pen Read-Only, (E)dit anyway, (R)ecover, (Q)uit, (A)bort:', term_getline(buf, 18))}) call term_sendkeys(buf, "q") + call TermWait(buf) + " check that Vim is still running + call term_sendkeys(buf, ":echo 'hello'\<CR>") + call WaitForAssert({-> assert_match('^hello', term_getline(buf, 18))}) + call term_sendkeys(buf, ":%bwipe!\<CR>") + call StopVimInTerminal(buf) %bwipe! call delete('Xfile1') - call delete('Xvimrc') endfunc func Test_swap_symlink() diff --git a/src/version.c b/src/version.c index 600af405a1..6192832d10 100644 --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3102, +/**/ 3101, /**/ 3100, |