diff options
| author | Bram Moolenaar <bram@vim.org> | 2013-06-17 21:53:37 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2013-06-17 21:53:37 +0200 |
| commit | 00f6e41aa7ff80250b7906806706eb11c12efec2 (patch) | |
| tree | 57f82ec5733546d9ab3f5e3a71ee99fe10bf95d6 | |
| parent | 0e65dde717cc9de163128ea5bb37b5f9955a6ffc (diff) | |
| download | vim-00f6e41aa7ff80250b7906806706eb11c12efec2.tar.gz | |
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)
| -rw-r--r-- | src/testdir/Make_dos.mak | 13 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak index 7c5b0eef..11ecd9a6 100644 --- 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 86f8a858..09f58715 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1218, +/**/ 1217, /**/ 1216, |