summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-06-16 16:57:46 +0200
committerBram Moolenaar <Bram@vim.org>2013-06-16 16:57:46 +0200
commit6949eea7cc79ef35921f82411bf8439a079ca424 (patch)
tree867c9d67b8d5372a412314d451e86600432be077
parent5246cd7a9bb514fd5c44f8deaf0b3ed889e1602f (diff)
downloadvim-git-6949eea7cc79ef35921f82411bf8439a079ca424.tar.gz
updated for version 7.3.1212v7.3.1212
Problem: "make test" on MS-Windows does not report failure like Unix does. Solution: Make it work like on Unix. (Taro Muraoka)
-rw-r--r--.gitignore1
-rw-r--r--src/testdir/Make_dos.mak27
-rw-r--r--src/version.c2
3 files changed, 19 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore
index 9caf09a03..8bfd0ca7f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,3 +53,4 @@ src/testdir/lua.vim
src/testdir/small.vim
src/testdir/tiny.vim
src/testdir/test*.out
+src/testdir/test.log
diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index fbb67cc29..7c5b0eef1 100644
--- 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
diff --git a/src/version.c b/src/version.c
index 6492078f8..8d730d00c 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 */
/**/
+ 1212,
+/**/
1211,
/**/
1210,