aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-08-22 19:27:53 -04:00
Code

patch 7.4.1026

Browse Source 
Problem:    When using MingW the tests do not clean up all files.  E.g. test
            17 leaves Xdir1 behind. (Michael Soyka)
Solution:   Also delete directories, like Make_dos.mak.  Delete files after
            directories to reduce warnings.
This commit is contained in:
Bram Moolenaar 2016-01-02 16:00:20 +01:00
parent 6c7b44472f
commit acf92d27c9
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/testdir/Make_dos.mak
View File

@ -51,10 +51,10 @@ $(TEST_OUTFILES): $(DOSTMP)\$(*B).in
$(VIMPROG) -u dos.vim -U NONE --noplugin -s dotest.in $(*B).in $(VIMPROG) -u dos.vim -U NONE --noplugin -s dotest.in $(*B).in
-@if exist test.out MOVE /y test.out $(DOSTMP)\$(*B).out -@if exist test.out MOVE /y test.out $(DOSTMP)\$(*B).out
-@if exist $(*B).in.bak move /y $(*B).in.bak $(*B).in -@if exist $(*B).in.bak move /y $(*B).in.bak $(*B).in
-@del X*
-@if exist test.ok del test.ok -@if exist test.ok del test.ok
-@if exist Xdir1 rd /s /q Xdir1 -@if exist Xdir1 rd /s /q Xdir1
-@if exist Xfind rd /s /q Xfind -@if exist Xfind rd /s /q Xfind
-@del X*
-@if exist viminfo del viminfo -@if exist viminfo del viminfo
$(VIMPROG) -u dos.vim --noplugin "+set ff=unix|f test.out|wq" \ $(VIMPROG) -u dos.vim --noplugin "+set ff=unix|f test.out|wq" \
$(DOSTMP)\$(*B).out $(DOSTMP)\$(*B).out
@ -87,9 +87,9 @@ clean:
-if exist mbyte.vim del mbyte.vim -if exist mbyte.vim del mbyte.vim
-if exist mzscheme.vim del mzscheme.vim -if exist mzscheme.vim del mzscheme.vim
-if exist lua.vim del lua.vim -if exist lua.vim del lua.vim
-del X*
-if exist Xdir1 rd /s /q Xdir1 -if exist Xdir1 rd /s /q Xdir1
-if exist Xfind rd /s /q Xfind -if exist Xfind rd /s /q Xfind
-del X*
-if exist viminfo del viminfo -if exist viminfo del viminfo
-if exist test.log del test.log -if exist test.log del test.log
-if exist messages del messages -if exist messages del messages

6
src/testdir/Make_ming.mak
View File

@ -10,12 +10,14 @@
ifneq (sh.exe, $(SHELL)) ifneq (sh.exe, $(SHELL))
DEL = rm -f DEL = rm -f
DELDIR = rm -rf
MV = mv MV = mv
CP = cp CP = cp
CAT = cat CAT = cat
DIRSLASH = / DIRSLASH = /
else else
DEL = del DEL = del
DELDIR = rd /s /q
MV = rename MV = rename
CP = copy CP = copy
CAT = type CAT = type
@ -76,6 +78,8 @@ clean:
-$(DEL) mbyte.vim -$(DEL) mbyte.vim
-$(DEL) mzscheme.vim -$(DEL) mzscheme.vim
-$(DEL) lua.vim -$(DEL) lua.vim
-$(DELDIR) Xdir1
-$(DELDIR) Xfind
-$(DEL) X* -$(DEL) X*
-$(DEL) viminfo -$(DEL) viminfo
@ -85,6 +89,8 @@ clean:
diff test.out $*.ok diff test.out $*.ok
-$(DEL) $*.out -$(DEL) $*.out
$(MV) test.out $*.out $(MV) test.out $*.out
-$(DELDIR) Xdir1
-$(DELDIR) Xfind
-$(DEL) X* -$(DEL) X*
-$(DEL) test.ok -$(DEL) test.ok
-$(DEL) viminfo -$(DEL) viminfo

2
src/version.c
View File

@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1026,
/**/ /**/
1025, 1025,
/**/ /**/