Mercurial > vim
changeset 4934:81e623ff2e55 v7.3.1212
updated for version 7.3.1212
Problem: "make test" on MS-Windows does not report failure like Unix does.
Solution: Make it work like on Unix. (Taro Muraoka)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Sun, 16 Jun 2013 16:57:46 +0200 |
| parents | 411ca276be59 |
| children | 8991454c0024 |
| files | .hgignore src/testdir/Make_dos.mak src/version.c |
| diffstat | 3 files changed, 19 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore +++ b/.hgignore @@ -55,3 +55,4 @@ src/testdir/lua.vim src/testdir/small.vim src/testdir/tiny.vim src/testdir/test*.out +src/testdir/test.log
--- a/src/testdir/Make_dos.mak +++ b/src/testdir/Make_dos.mak @@ -40,23 +40,25 @@ SCRIPTS_GUI = test16.out .SUFFIXES: .in .out -nongui: fixff $(SCRIPTS16) $(SCRIPTS) - echo ALL DONE +nongui: fixff $(SCRIPTS16) $(SCRIPTS) report -small: - echo ALL DONE +small: report -gui: fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS_GUI) - echo ALL DONE +gui: fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS_GUI) report -win32: fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS32) - echo ALL DONE +win32: fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS32) report fixff: -$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok -$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=unix|upd" +q \ dotest.in test60.ok test71.ok test74.ok +report: + @echo "" + @echo Test results: + @IF EXIST test.log ( type test.log & echo TEST FAILURE & exit /b 1 ) \ + ELSE ( ECHO ALL DONE ) + clean: -del *.out -if exist test.ok del test.ok @@ -67,15 +69,18 @@ clean: -if exist lua.vim del lua.vim -del X* -if exist viminfo del viminfo + -del test.log .in.out: copy $*.ok test.ok $(VIMPROG) -u dos.vim -U NONE --noplugin -s dotest.in $*.in - diff test.out $*.ok - -if exist $*.out del $*.out - rename test.out $*.out + @diff test.out $*.ok & if errorlevel 1 (echo $* FAILED >> test.log ) \ + else ( del /F $*.out & rename test.out $*.out ) -del X* -del X*.* -del test.ok -rd /s /q Xfind -if exist viminfo del viminfo + +nolog: + -del test.log