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)

diff --git a/.gitignore b/.gitignore
index 9caf09a03cae52a1fd5bc2fec9b969f8b01dc15f..8bfd0ca7f2e69c69d0d4d03270a1feb4e6f43cf6 100644 (file)
--- 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 fbb67cc29e58faf1cad875a862b53a0dcf10f6cf..7c5b0eef1e74c3aa2e72e602f6d1b55e296984a9 100644 (file)
--- 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 6492078f8b18d0e345a828f333eed787ce15ae5a..8d730d00c6b9fbe0ca174a912ab58082b68e3e94 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1212,
 /**/
     1211,
 /**/