diff options
| author | Shougo <Shougo.Matsu@gmail.com> | 2017-01-15 08:44:16 +0900 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-01-15 00:44:16 +0100 |
| commit | b98da8de9823301dc2cb2f5fd14122a8afbcd50f (patch) | |
| tree | 2e0781582851ba0d98df34dfdf0953775f278936 | |
| parent | 14743042242c22a958de9ac457f8cf151de9ec84 (diff) | |
| download | rneovim-b98da8de9823301dc2cb2f5fd14122a8afbcd50f.tar.gz rneovim-b98da8de9823301dc2cb2f5fd14122a8afbcd50f.tar.bz2 rneovim-b98da8de9823301dc2cb2f5fd14122a8afbcd50f.zip | |
vim-patch:7.4.1910 (#5948)
Problem: Tests using external command to delete directory.
Solution: Use delete().
https://github.com/vim/vim/commit/abc70bbf363dbbe3f2bf714102f55648a512791e
| -rw-r--r-- | src/nvim/testdir/test17.in | 14 | ||||
| -rw-r--r-- | src/nvim/testdir/test73.in | 11 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
3 files changed, 7 insertions, 20 deletions
diff --git a/src/nvim/testdir/test17.in b/src/nvim/testdir/test17.in index 83abe17770..1a4ac6b6d1 100644 --- a/src/nvim/testdir/test17.in +++ b/src/nvim/testdir/test17.in @@ -4,13 +4,7 @@ Tests for: STARTTEST :set isfname=@,48-57,/,.,-,_,+,,,$,:,~,{,} -: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 @@ -36,7 +30,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 @@ -61,7 +55,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' @@ -91,7 +85,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' diff --git a/src/nvim/testdir/test73.in b/src/nvim/testdir/test73.in index 7d6c7287a5..9d50f7a789 100644 --- a/src/nvim/testdir/test73.in +++ b/src/nvim/testdir/test73.in @@ -8,16 +8,9 @@ STARTTEST :" This will cause a few errors, do it silently. :set visualbell :" -: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' @@ -169,7 +162,7 @@ SVoyager 2:w :exec "w >>" . test_out :q :exec "cd " . cwd -:call DeleteDirectory("Xfind") +:call delete("Xfind", "rf") :qa! ENDTEST diff --git a/src/nvim/version.c b/src/nvim/version.c index 3f5e480f7f..3532d3dfab 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -530,7 +530,7 @@ static int included_patches[] = { 1913, 1912, // 1911 NA - // 1910, + 1910, 1909, // 1908 NA // 1907 NA |