Mercurial > vim
changeset 9254:05e7d084c6c2 v7.4.1910
commit https://github.com/vim/vim/commit/abc70bbf363dbbe3f2bf714102f55648a512791e
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Jun 8 21:48:50 2016 +0200
patch 7.4.1910
Problem: Tests using external command to delete directory.
Solution: Use delete().
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Wed, 08 Jun 2016 22:00:06 +0200 |
| parents | 949eb1171f2b |
| children | 8735c9123f66 |
| files | src/testdir/test17.in src/testdir/test73.in src/testdir/test_getcwd.in src/version.c |
| diffstat | 4 files changed, 10 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test17.in +++ b/src/testdir/test17.in @@ -9,13 +9,7 @@ STARTTEST :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 @@ STARTTEST :" 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 @@ ENDTEST 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 @@ ENDTEST 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'
--- a/src/testdir/test73.in +++ b/src/testdir/test73.in @@ -9,16 +9,9 @@ STARTTEST :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 @@ SVoyager 2:w :exec "w >>" . test_out :q :exec "cd " . cwd -:call DeleteDirectory("Xfind") +:call delete("Xfind", "rf") :qa! ENDTEST
--- a/src/testdir/test_getcwd.in +++ b/src/testdir/test_getcwd.in @@ -9,14 +9,6 @@ STARTTEST :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 @@ STARTTEST :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 @@ STARTTEST :call writefile(r, test_out, "a") :q :exec "cd " . cwd -:call DeleteDirectory("Xtopdir") +:call delete("Xtopdir", "rf") :qa! ENDTEST