Skip to content

Commit

Permalink
updated for version 7.3.1212
Browse files Browse the repository at this point in the history
Problem:    "make test" on MS-Windows does not report failure like Unix does.
Solution:   Make it work like on Unix. (Taro Muraoka)
  • Loading branch information
brammool committed Jun 16, 2013
1 parent 5246cd7 commit 6949eea
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 11 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,4 @@ src/testdir/lua.vim
src/testdir/small.vim
src/testdir/tiny.vim
src/testdir/test*.out
src/testdir/test.log
27 changes: 16 additions & 11 deletions src/testdir/Make_dos.mak
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -728,6 +728,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1212,
/**/
1211,
/**/
Expand Down

0 comments on commit 6949eea

Please sign in to comment.