From: Bram Moolenaar Date: Fri, 5 Mar 2021 19:58:22 +0000 (+0100) Subject: patch 8.2.2571: test may leave file behind X-Git-Tag: v8.2.2571 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=8c801b374b7d32419cd877353495b801c5e1382a;p=thirdparty%2Fvim.git patch 8.2.2571: test may leave file behind Problem: Test may leave file behind. Solution: Delete the temporary file. Don't profile in the running Vim instance. --- diff --git a/src/testdir/test_profile.vim b/src/testdir/test_profile.vim index 785cee3270..13f5fae566 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 6ade326226..6f25f1dff0 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 add4c38dac..58908cda18 100644 --- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2571, /**/ 2570, /**/