summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-01-11 18:47:00 +0100
committerBram Moolenaar <Bram@vim.org>2021-01-11 18:47:00 +0100
commit48e11c10548782f573411b6302f77adb69c40401 (patch)
tree9404560a557d9dc20c4ab0b7b7fe191c3e59eeb4
parent16a6f91ccb42ebde639a4185322b07719d345e86 (diff)
downloadvim-git-48e11c10548782f573411b6302f77adb69c40401.tar.gz
patch 8.2.2328: some test files may not be deletedv8.2.2328
Problem: Some test files may not be deleted. Solution: Add a delete() call, correct name. (Dominique Pellé, closes #7654)
-rw-r--r--src/testdir/test_clientserver.vim1
-rw-r--r--src/testdir/test_vim9_script.vim4
-rw-r--r--src/version.c2
3 files changed, 5 insertions, 2 deletions
diff --git a/src/testdir/test_clientserver.vim b/src/testdir/test_clientserver.vim
index f838e221a..6a73d93e5 100644
--- a/src/testdir/test_clientserver.vim
+++ b/src/testdir/test_clientserver.vim
@@ -81,6 +81,7 @@ func Test_client_server()
call writefile(['one', 'two'], 'Xclientfile')
call system(cmd)
call WaitForAssert({-> assert_equal('two', remote_expr(name, "getline(2)", "", 2))})
+ call delete('Xclientfile')
" Expression evaluated locally.
if v:servername == ''
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index d9aa71e26..1066a1d43 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -1238,7 +1238,7 @@ def Test_vim9script_reload_noclear()
assert_equal(3, g:loadCount)
assert_equal(['init', 'yes', 'again', 'once', 'thexport'], g:Values())
- delete('Xreloaded')
+ delete('XReloaded')
delete('XExportReload')
delfunc g:Values
unlet g:loadCount
@@ -2966,7 +2966,7 @@ def Test_vim9_autoload_error()
invalid
endfu
try
- invalid
+ alsoinvalid
catch /wontmatch/
endtry
END
diff --git a/src/version.c b/src/version.c
index e64265fb2..f56da436b 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 */
/**/
+ 2328,
+/**/
2327,
/**/
2326,