Skip to content

Commit 529ed4b

Browse files
committed
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)
1 parent 2ddd292 commit 529ed4b

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

src/testdir/Make_dos.mak

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,25 +61,30 @@ report:
6161

6262
clean:
6363
-del *.out
64+
-del *.failed
6465
-if exist test.ok del test.ok
6566
-if exist small.vim del small.vim
6667
-if exist tiny.vim del tiny.vim
6768
-if exist mbyte.vim del mbyte.vim
6869
-if exist mzscheme.vim del mzscheme.vim
6970
-if exist lua.vim del lua.vim
7071
-del X*
72+
-if exist Xdir1 rd /s /q Xdir1
73+
-if exist Xfind rd /s /q Xfind
7174
-if exist viminfo del viminfo
7275
-del test.log
7376

7477
.in.out:
78+
-if exist $*.failed del $*.failed
7579
copy $*.ok test.ok
7680
$(VIMPROG) -u dos.vim -U NONE --noplugin -s dotest.in $*.in
77-
@diff test.out $*.ok & if errorlevel 1 (echo $* FAILED >> test.log ) \
78-
else ( del /F $*.out & rename test.out $*.out )
81+
@diff test.out $*.ok & if errorlevel 1 \
82+
( move /y test.out $*.failed & echo $* FAILED >> test.log ) \
83+
else ( move /y test.out $*.out )
7984
-del X*
80-
-del X*.*
8185
-del test.ok
82-
-rd /s /q Xfind
86+
-if exist Xdir1 rd /s /q Xdir1
87+
-if exist Xfind rd /s /q Xfind
8388
-if exist viminfo del viminfo
8489

8590
nolog:

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -728,6 +728,8 @@ static char *(features[]) =
728728

729729
static int included_patches[] =
730730
{ /* Add new patch number below this line */
731+
/**/
732+
1218,
731733
/**/
732734
1217,
733735
/**/

0 commit comments

Comments
 (0)