Skip to content

Commit 58e04e3

Browse files
committed
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)
1 parent ef22aec commit 58e04e3

3 files changed

Lines changed: 19 additions & 11 deletions

File tree

.hgignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,4 @@ src/testdir/lua.vim
5555
src/testdir/small.vim
5656
src/testdir/tiny.vim
5757
src/testdir/test*.out
58+
src/testdir/test.log

src/testdir/Make_dos.mak

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,23 +40,25 @@ SCRIPTS_GUI = test16.out
4040

4141
.SUFFIXES: .in .out
4242

43-
nongui: fixff $(SCRIPTS16) $(SCRIPTS)
44-
echo ALL DONE
43+
nongui: fixff $(SCRIPTS16) $(SCRIPTS) report
4544

46-
small:
47-
echo ALL DONE
45+
small: report
4846

49-
gui: fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS_GUI)
50-
echo ALL DONE
47+
gui: fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS_GUI) report
5148

52-
win32: fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS32)
53-
echo ALL DONE
49+
win32: fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS32) report
5450

5551
fixff:
5652
-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok
5753
-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=unix|upd" +q \
5854
dotest.in test60.ok test71.ok test74.ok
5955

56+
report:
57+
@echo ""
58+
@echo Test results:
59+
@IF EXIST test.log ( type test.log & echo TEST FAILURE & exit /b 1 ) \
60+
ELSE ( ECHO ALL DONE )
61+
6062
clean:
6163
-del *.out
6264
-if exist test.ok del test.ok
@@ -67,15 +69,18 @@ clean:
6769
-if exist lua.vim del lua.vim
6870
-del X*
6971
-if exist viminfo del viminfo
72+
-del test.log
7073

7174
.in.out:
7275
copy $*.ok test.ok
7376
$(VIMPROG) -u dos.vim -U NONE --noplugin -s dotest.in $*.in
74-
diff test.out $*.ok
75-
-if exist $*.out del $*.out
76-
rename test.out $*.out
77+
@diff test.out $*.ok & if errorlevel 1 (echo $* FAILED >> test.log ) \
78+
else ( del /F $*.out & rename test.out $*.out )
7779
-del X*
7880
-del X*.*
7981
-del test.ok
8082
-rd /s /q Xfind
8183
-if exist viminfo del viminfo
84+
85+
nolog:
86+
-del test.log

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -728,6 +728,8 @@ static char *(features[]) =
728728

729729
static int included_patches[] =
730730
{ /* Add new patch number below this line */
731+
/**/
732+
1212,
731733
/**/
732734
1211,
733735
/**/

0 commit comments

Comments
 (0)