0
0
mirror of https://github.com/vim/vim.git synced 2025-10-07 05:54:16 -04:00

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)
This commit is contained in:
Bram Moolenaar
2013-06-16 16:57:46 +02:00
parent 5246cd7a9b
commit 6949eea7cc
3 changed files with 19 additions and 11 deletions

1
.gitignore vendored
View File

@@ -53,3 +53,4 @@ src/testdir/lua.vim
src/testdir/small.vim src/testdir/small.vim
src/testdir/tiny.vim src/testdir/tiny.vim
src/testdir/test*.out src/testdir/test*.out
src/testdir/test.log

View File

@@ -40,23 +40,25 @@ SCRIPTS_GUI = test16.out
.SUFFIXES: .in .out .SUFFIXES: .in .out
nongui: fixff $(SCRIPTS16) $(SCRIPTS) nongui: fixff $(SCRIPTS16) $(SCRIPTS) report
echo ALL DONE
small: small: report
echo ALL DONE
gui: fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS_GUI) gui: fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS_GUI) report
echo ALL DONE
win32: fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS32) win32: fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS32) report
echo ALL DONE
fixff: fixff:
-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok -$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok
-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=unix|upd" +q \ -$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=unix|upd" +q \
dotest.in test60.ok test71.ok test74.ok 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: clean:
-del *.out -del *.out
-if exist test.ok del test.ok -if exist test.ok del test.ok
@@ -67,15 +69,18 @@ clean:
-if exist lua.vim del lua.vim -if exist lua.vim del lua.vim
-del X* -del X*
-if exist viminfo del viminfo -if exist viminfo del viminfo
-del test.log
.in.out: .in.out:
copy $*.ok test.ok copy $*.ok test.ok
$(VIMPROG) -u dos.vim -U NONE --noplugin -s dotest.in $*.in $(VIMPROG) -u dos.vim -U NONE --noplugin -s dotest.in $*.in
diff test.out $*.ok @diff test.out $*.ok & if errorlevel 1 (echo $* FAILED >> test.log ) \
-if exist $*.out del $*.out else ( del /F $*.out & rename test.out $*.out )
rename test.out $*.out
-del X* -del X*
-del X*.* -del X*.*
-del test.ok -del test.ok
-rd /s /q Xfind -rd /s /q Xfind
-if exist viminfo del viminfo -if exist viminfo del viminfo
nolog:
-del test.log

View File

@@ -728,6 +728,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1212,
/**/ /**/
1211, 1211,
/**/ /**/