Skip to content

Commit 4e5a31c

Browse files
committed
patch 7.4.994
Problem: New style tests are not run on MS-Windows. Solution: Add the new style tests.
1 parent 52f6ae1 commit 4e5a31c

2 files changed

Lines changed: 18 additions & 4 deletions

File tree

src/testdir/Make_dos.mak

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@ DOSTMP = dostmp
2525
DOSTMP_OUTFILES = $(TEST_OUTFILES:test=dostmp\test)
2626
DOSTMP_INFILES = $(DOSTMP_OUTFILES:.out=.in)
2727

28-
.SUFFIXES: .in .out
28+
.SUFFIXES: .in .out .res .vim
2929

3030
# Must run test1 first to create small.vim.
3131
$(SCRIPTS) $(SCRIPTS_GUI) $(SCRIPTS_WIN32) $(NEW_TESTS): $(SCRIPTS_FIRST)
3232

33-
nongui: nolog $(SCRIPTS_FIRST) $(SCRIPTS) report
33+
nongui: nolog $(SCRIPTS_FIRST) $(SCRIPTS) newtests report
3434

3535
small: nolog report
3636

37-
gui: nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_GUI) report
37+
gui: nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_GUI) newtests report
3838

39-
win32: nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_WIN32) report
39+
win32: nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_WIN32) newtests report
4040

4141
# Copy the input files to dostmp, changing the fileformat to dos.
4242
$(DOSTMP_INFILES): $(*B).in
@@ -76,6 +76,7 @@ report:
7676
clean:
7777
-del *.out
7878
-del *.failed
79+
-del *.res
7980
-if exist $(DOSTMP) rd /s /q $(DOSTMP)
8081
-if exist test.in del test.in
8182
-if exist test.ok del test.ok
@@ -89,10 +90,12 @@ clean:
8990
-if exist Xfind rd /s /q Xfind
9091
-if exist viminfo del viminfo
9192
-if exist test.log del test.log
93+
-if exist messages del messages
9294
-if exist benchmark.out del benchmark.out
9395

9496
nolog:
9597
-if exist test.log del test.log
98+
-if exist messages del messages
9699

97100
benchmark:
98101
bench_re_freeze.out
@@ -101,3 +104,12 @@ bench_re_freeze.out: bench_re_freeze.vim
101104
-if exist benchmark.out del benchmark.out
102105
$(VIMPROG) -u dos.vim -U NONE --noplugin $*.in
103106
@IF EXIST benchmark.out ( type benchmark.out )
107+
108+
# New style of tests uses Vim script with assert calls. These are easier
109+
# to write and a lot easier to read and debug.
110+
# Limitation: Only works with the +eval feature.
111+
112+
newtests: $(NEW_TESTS)
113+
114+
.vim.res:
115+
$(VIMPROG) -u NONE -S runtest.vim $*.vim

src/version.c

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

742742
static int included_patches[] =
743743
{ /* Add new patch number below this line */
744+
/**/
745+
994,
744746
/**/
745747
993,
746748
/**/

0 commit comments

Comments
 (0)