Skip to content

Commit 5b4a376

Browse files
committed
patch 7.4.2168
Problem: Not running the startup test on MS-Windows. Solution: Write vimcmd.
1 parent c96a2f3 commit 5b4a376

3 files changed

Lines changed: 11 additions & 5 deletions

File tree

src/testdir/Make_dos.mak

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,4 +114,6 @@ bench_re_freeze.out: bench_re_freeze.vim
114114
newtests: $(NEW_TESTS)
115115

116116
.vim.res:
117+
@echo "$(VIMPROG)" > vimcmd
117118
$(VIMPROG) -u NONE $(NO_PLUGIN) -S runtest.vim $*.vim
119+
@del vimcmd

src/testdir/Make_ming.mak

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,21 +48,21 @@ $(SCRIPTS) $(SCRIPTS_GUI) $(SCRIPTS_WIN32) $(NEW_TESTS): $(SCRIPTS_FIRST)
4848
.SUFFIXES: .in .out .res .vim
4949

5050
vimall: fixff $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_GUI) $(SCRIPTS_WIN32) newtests
51-
echo ALL DONE
51+
@echo ALL DONE
5252

5353
nongui: fixff nolog $(SCRIPTS_FIRST) $(SCRIPTS) newtests
54-
echo ALL DONE
54+
@echo ALL DONE
5555

5656
benchmark: $(SCRIPTS_BENCH)
5757

5858
small: nolog
59-
echo ALL DONE
59+
@echo ALL DONE
6060

6161
gui: fixff nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_GUI) newtests
62-
echo ALL DONE
62+
@echo ALL DONE
6363

6464
win32: fixff nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_WIN32) newtests
65-
echo ALL DONE
65+
@echo ALL DONE
6666

6767
# TODO: find a way to avoid changing the distributed files.
6868
fixff:
@@ -117,5 +117,7 @@ bench_re_freeze.out: bench_re_freeze.vim
117117
newtests: $(NEW_TESTS)
118118

119119
.vim.res:
120+
@echo "$(VIMPROG)" > vimcmd
120121
$(VIMPROG) -u NONE $(NO_PLUGIN) -S runtest.vim $*.vim
122+
@$(DEL) vimcmd
121123

src/version.c

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

764764
static int included_patches[] =
765765
{ /* Add new patch number below this line */
766+
/**/
767+
2168,
766768
/**/
767769
2167,
768770
/**/

0 commit comments

Comments
 (0)