updated for version 7.3.1218

Problem:    "make test" on MS-Windows does not clean all temporary files and
            gives some unneccessary message.
Solution:   Clean the right files.  Create .failed files. (Ken Takata)

diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index 7c5b0eef1e74c3aa2e72e602f6d1b55e296984a9..11ecd9a671cd07db44d14e7554b8f55ac218878c 100644 (file)
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -61,6 +61,7 @@ report:
 
 clean:
        -del *.out
+       -del *.failed
        -if exist test.ok del test.ok
        -if exist small.vim del small.vim
        -if exist tiny.vim del tiny.vim
@@ -68,18 +69,22 @@ clean:
        -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
        -if exist viminfo del viminfo
        -del test.log
 
 .in.out:
+       -if exist $*.failed del $*.failed
        copy $*.ok test.ok
        $(VIMPROG) -u dos.vim -U NONE --noplugin -s dotest.in $*.in
-       @diff test.out $*.ok & if errorlevel 1 (echo $* FAILED >> test.log ) \
-               else ( del /F $*.out & rename test.out $*.out )
+       @diff test.out $*.ok & if errorlevel 1 \
+               ( move /y test.out $*.failed & echo $* FAILED >> test.log ) \
+               else ( move /y test.out $*.out )
        -del X*
-       -del X*.*
        -del test.ok
-       -rd /s /q Xfind
+       -if exist Xdir1 rd /s /q Xdir1
+       -if exist Xfind rd /s /q Xfind
        -if exist viminfo del viminfo
 
 nolog:

diff --git a/src/version.c b/src/version.c
index 86f8a858f257930531bcbb83544ce8e3502d1d10..09f58715f0c8b0cc3d65b5948f40ff5e39147120 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1218,
 /**/
     1217,
 /**/