IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.1910 (#5948)

Browse Source 
Problem:    Tests using external command to delete directory.
Solution:   Use delete().

abc70bbf36
This commit is contained in:
Shougo 2017-01-15 08:44:16 +09:00 committed by Justin M. Keyes
parent 1474304224
commit b98da8de98
3 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/nvim/testdir/test17.in
View File

@ -4,13 +4,7 @@ Tests for:
STARTTEST STARTTEST
:set isfname=@,48-57,/,.,-,_,+,,,$,:,~,{,} :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") :if has("unix")
:let $CDIR = "." :let $CDIR = "."
/CDIR /CDIR
@ -36,7 +30,7 @@ STARTTEST
:" check for 'include' without \zs or \ze :" check for 'include' without \zs or \ze
:lang C :lang C
:call delete("./Xbase.a") :call delete("./Xbase.a")
:call DeleteDirectory("Xdir1") :call delete("Xdir1", "rf")
:!mkdir Xdir1 :!mkdir Xdir1
:!mkdir "Xdir1/dir2" :!mkdir "Xdir1/dir2"
:e! Xdir1/dir2/foo.a :e! Xdir1/dir2/foo.a
@ -61,7 +55,7 @@ ENDTEST
STARTTEST STARTTEST
:" check for 'include' with \zs and \ze :" check for 'include' with \zs and \ze
:call delete("./Xbase.b") :call delete("./Xbase.b")
:call DeleteDirectory("Xdir1") :call delete("Xdir1", "rf")
:!mkdir Xdir1 :!mkdir Xdir1
:!mkdir "Xdir1/dir2" :!mkdir "Xdir1/dir2"
:let &include='^\s*%inc\s*/\zs[^/]\+\ze' :let &include='^\s*%inc\s*/\zs[^/]\+\ze'
@ -91,7 +85,7 @@ ENDTEST
STARTTEST STARTTEST
:" check for 'include' with \zs and no \ze :" check for 'include' with \zs and no \ze
:call delete("./Xbase.c") :call delete("./Xbase.c")
:call DeleteDirectory("Xdir1") :call delete("Xdir1", "rf")
:!mkdir Xdir1 :!mkdir Xdir1
:!mkdir "Xdir1/dir2" :!mkdir "Xdir1/dir2"
:let &include='^\s*%inc\s*\%([[:upper:]][^[:space:]]*\s\+\)\?\zs\S\+\ze' :let &include='^\s*%inc\s*\%([[:upper:]][^[:space:]]*\s\+\)\?\zs\S\+\ze'

11
src/nvim/testdir/test73.in
View File

@ -8,16 +8,9 @@ STARTTEST
:" This will cause a few errors, do it silently. :" This will cause a few errors, do it silently.
:set visualbell :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 :" On windows a stale "Xfind" directory may exist, remove it so that
:" we start from a clean state. :" we start from a clean state.
:call DeleteDirectory("Xfind") :call delete("Xfind", "rf")
:new :new
:let cwd=getcwd() :let cwd=getcwd()
:let test_out = cwd . '/test.out' :let test_out = cwd . '/test.out'
@ -169,7 +162,7 @@ SVoyager 2:w
:exec "w >>" . test_out :exec "w >>" . test_out
:q :q
:exec "cd " . cwd :exec "cd " . cwd
:call DeleteDirectory("Xfind") :call delete("Xfind", "rf")
:qa! :qa!
ENDTEST ENDTEST

2
src/nvim/version.c
View File

@ -530,7 +530,7 @@ static int included_patches[] = {
1913, 1913,
1912, 1912,
// 1911 NA // 1911 NA
// 1910, 1910,
1909, 1909,
// 1908 NA // 1908 NA
// 1907 NA // 1907 NA