diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-03-05 20:58:22 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-03-05 20:58:22 +0100 |
| commit | 8c801b374b7d32419cd877353495b801c5e1382a (patch) | |
| tree | 0d8154a4b6cd447b4e5cb2f5e19e606c2a22197f | |
| parent | f9a65505d1d93f3e67e5b8646bde3bbc44c70f7d (diff) | |
| download | vim-git-8c801b374b7d32419cd877353495b801c5e1382a.tar.gz | |
patch 8.2.2571: test may leave file behindv8.2.2571
Problem: Test may leave file behind.
Solution: Delete the temporary file. Don't profile in the running Vim
instance.
| -rw-r--r-- | src/testdir/test_profile.vim | 2 | ||||
| -rw-r--r-- | src/testdir/test_quickfix.vim | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/src/testdir/test_profile.vim b/src/testdir/test_profile.vim index 785cee327..13f5fae56 100644 --- a/src/testdir/test_profile.vim +++ b/src/testdir/test_profile.vim @@ -600,7 +600,7 @@ func Test_vim9_profiling() call writefile(lines, 'Xprofile_crash.vim') call system(GetVimCommandClean() . ' -es -c "so Xprofile_crash.vim" -c q') call assert_equal(0, v:shell_error) - call CheckScriptSuccess(lines) + call assert_true(readfile('Xprofile_crash.log')->len() > 10) call delete('Xprofile_crash.vim') call delete('Xprofile_crash.log') endfunc diff --git a/src/testdir/test_quickfix.vim b/src/testdir/test_quickfix.vim index 6ade32622..6f25f1dff 100644 --- a/src/testdir/test_quickfix.vim +++ b/src/testdir/test_quickfix.vim @@ -5362,4 +5362,14 @@ func Test_qfbuf_update() call Xqfbuf_update('l') endfunc +func Test_vimgrep_noswapfile() + set noswapfile + call writefile(['one', 'two', 'three'], 'Xgreppie') + vimgrep two Xgreppie + call assert_equal('two', getline('.')) + + call delete('Xgreppie') + set swapfile +endfunc + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index add4c38da..58908cda1 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2571, +/**/ 2570, /**/ 2569, |