Mercurial > vim

changeset 7445:e81526d6709f v7.4.1026

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/acf92d27c94811e3bd6b84cfd54246e91d44c355 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jan 2 16:00:20 2016 +0100 patch 7.4.1026 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.
author Christian Brabandt <cb@256bit.org>
date Sat, 02 Jan 2016 16:15:03 +0100
parents 045cd3a3a7ae
children a67ee44e5848
files src/testdir/Make_dos.mak src/testdir/Make_ming.mak src/version.c
diffstat 3 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -51,10 +51,10 @@ win32:	nolog $(SCRIPTS_FIRST) $(SCRIPTS)
 	$(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 $(*B).in.bak move /y $(*B).in.bak $(*B).in
-	-@del X*
 	-@if exist test.ok del test.ok
 	-@if exist Xdir1 rd /s /q Xdir1
 	-@if exist Xfind rd /s /q Xfind
+	-@del X*
 	-@if exist viminfo del viminfo
 	$(VIMPROG) -u dos.vim --noplugin "+set ff=unix|f test.out|wq" \
 		$(DOSTMP)\$(*B).out
@@ -87,9 +87,9 @@ clean:
 	-if exist mbyte.vim del mbyte.vim
 	-if exist mzscheme.vim del mzscheme.vim
 	-if exist lua.vim del lua.vim
-	-del X*
 	-if exist Xdir1 rd /s /q Xdir1
 	-if exist Xfind rd /s /q Xfind
+	-del X*
 	-if exist viminfo del viminfo
 	-if exist test.log del test.log
 	-if exist messages del messages
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -10,12 +10,14 @@
 
 ifneq (sh.exe, $(SHELL))
 DEL = rm -f
+DELDIR = rm -rf
 MV = mv
 CP = cp
 CAT = cat
 DIRSLASH = /
 else
 DEL = del
+DELDIR = rd /s /q
 MV = rename
 CP = copy
 CAT = type
@@ -76,6 +78,8 @@ clean:
 	-$(DEL) mbyte.vim
 	-$(DEL) mzscheme.vim
 	-$(DEL) lua.vim
+	-$(DELDIR) Xdir1
+	-$(DELDIR) Xfind
 	-$(DEL) X*
 	-$(DEL) viminfo
 
@@ -85,6 +89,8 @@ clean:
 	diff test.out $*.ok
 	-$(DEL) $*.out
 	$(MV) test.out $*.out
+	-$(DELDIR) Xdir1
+	-$(DELDIR) Xfind
 	-$(DEL) X*
 	-$(DEL) test.ok
 	-$(DEL) viminfo
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1026,
+/**/
     1025,
 /**/
     1024,