patch 7.4.1910
Problem: Tests using external command to delete directory.
Solution: Use delete().
diff --git a/src/testdir/test17.in b/src/testdir/test17.in
index 3a0a9bb..59b57c2 100644
--- a/src/testdir/test17.in
+++ b/src/testdir/test17.in
@@ -9,13 +9,7 @@
:else
: set isfname=@,48-57,/,.,-,_,+,,,$,:,~,{,}
:endif
-:function! DeleteDirectory(dir)
-: if has("win16") || has("win32") || has("win64") || has("dos16") || has("dos32")
-: exec "silent !rmdir /Q /S " . a:dir
-: else
-: exec "silent !rm -rf " . a:dir
-: endif
-:endfun
+:"
:if has("unix")
:let $CDIR = "."
/CDIR
@@ -45,7 +39,7 @@
:" check for 'include' without \zs or \ze
:lang C
:call delete("./Xbase.a")
-:call DeleteDirectory("Xdir1")
+:call delete("Xdir1", "rf")
:!mkdir Xdir1
:!mkdir "Xdir1/dir2"
:e! Xdir1/dir2/foo.a
@@ -70,7 +64,7 @@
STARTTEST
:" check for 'include' with \zs and \ze
:call delete("./Xbase.b")
-:call DeleteDirectory("Xdir1")
+:call delete("Xdir1", "rf")
:!mkdir Xdir1
:!mkdir "Xdir1/dir2"
:let &include='^\s*%inc\s*/\zs[^/]\+\ze'
@@ -100,7 +94,7 @@
STARTTEST
:" check for 'include' with \zs and no \ze
:call delete("./Xbase.c")
-:call DeleteDirectory("Xdir1")
+:call delete("Xdir1", "rf")
:!mkdir Xdir1
:!mkdir "Xdir1/dir2"
:let &include='^\s*%inc\s*\%([[:upper:]][^[:space:]]*\s\+\)\?\zs\S\+\ze'
diff --git a/src/testdir/test73.in b/src/testdir/test73.in
index 666e4d2..a0b9ae8 100644
--- a/src/testdir/test73.in
+++ b/src/testdir/test73.in
@@ -9,16 +9,9 @@
:set visualbell
:set nocp viminfo+=nviminfo
:"
-:function! DeleteDirectory(dir)
-: if has("win16") || has("win32") || has("win64") || has("dos16") || has("dos32")
-: exec "silent !rmdir /Q /S " . a:dir
-: else
-: exec "silent !rm -rf " . a:dir
-: endif
-:endfun
:" On windows a stale "Xfind" directory may exist, remove it so that
:" we start from a clean state.
-:call DeleteDirectory("Xfind")
+:call delete("Xfind", "rf")
:new
:let cwd=getcwd()
:let test_out = cwd . '/test.out'
@@ -170,7 +163,7 @@
:exec "w >>" . test_out
:q
:exec "cd " . cwd
-:call DeleteDirectory("Xfind")
+:call delete("Xfind", "rf")
:qa!
ENDTEST
diff --git a/src/testdir/test_getcwd.in b/src/testdir/test_getcwd.in
index 8c7b24e..e92ea1b 100644
--- a/src/testdir/test_getcwd.in
+++ b/src/testdir/test_getcwd.in
@@ -9,14 +9,6 @@
:set visualbell
:set nocp viminfo+=nviminfo
:"
-:function! DeleteDirectory(dir)
-: if has("win16") || has("win32") || has("win64") || has("dos16") || has("dos32")
-: exec "silent !rmdir /Q /S " . a:dir
-: else
-: exec "silent !rm -rf " . a:dir
-: endif
-:endfun
-:"
:function! GetCwdInfo(win, tab)
: let tab_changed = 0
: let mod = ":t"
@@ -42,7 +34,7 @@
:endfunction
:" On windows a stale "Xtopdir" directory may exist, remove it so that
:" we start from a clean state.
-:call DeleteDirectory("Xtopdir")
+:call delete("Xtopdir", "rf")
:let r=[]
:new
:let cwd=getcwd()
@@ -94,7 +86,7 @@
:call writefile(r, test_out, "a")
:q
:exec "cd " . cwd
-:call DeleteDirectory("Xtopdir")
+:call delete("Xtopdir", "rf")
:qa!
ENDTEST
diff --git a/src/version.c b/src/version.c
index 9aba54c..ad79eff 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1910,
+/**/
1909,
/**/
1908,
