diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-08-06 20:36:34 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-08-06 20:36:34 +0200 |
| commit | 5b4a3767f6d1760ba1ce103ef3cffb696ece0244 (patch) | |
| tree | c83fc192e49fd6074f90c5d336b05bc6d1a8bf6e | |
| parent | c96a2f3b887d9a1f850f0dacc92616bee11f966b (diff) | |
patch 7.4.2168v7.4.2168
Problem: Not running the startup test on MS-Windows.
Solution: Write vimcmd.
| -rw-r--r-- | src/testdir/Make_dos.mak | 2 | ||||
| -rw-r--r-- | src/testdir/Make_ming.mak | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 11 insertions, 5 deletions
diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak index 66cf12f2e1..b6aaa6e68f 100644 --- a/src/testdir/Make_dos.mak +++ b/src/testdir/Make_dos.mak @@ -114,4 +114,6 @@ bench_re_freeze.out: bench_re_freeze.vim newtests: $(NEW_TESTS) .vim.res: + @echo "$(VIMPROG)" > vimcmd $(VIMPROG) -u NONE $(NO_PLUGIN) -S runtest.vim $*.vim + @del vimcmd diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak index c2c0239524..33306910ad 100644 --- a/src/testdir/Make_ming.mak +++ b/src/testdir/Make_ming.mak @@ -48,21 +48,21 @@ $(SCRIPTS) $(SCRIPTS_GUI) $(SCRIPTS_WIN32) $(NEW_TESTS): $(SCRIPTS_FIRST) .SUFFIXES: .in .out .res .vim vimall: fixff $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_GUI) $(SCRIPTS_WIN32) newtests - echo ALL DONE + @echo ALL DONE nongui: fixff nolog $(SCRIPTS_FIRST) $(SCRIPTS) newtests - echo ALL DONE + @echo ALL DONE benchmark: $(SCRIPTS_BENCH) small: nolog - echo ALL DONE + @echo ALL DONE gui: fixff nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_GUI) newtests - echo ALL DONE + @echo ALL DONE win32: fixff nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_WIN32) newtests - echo ALL DONE + @echo ALL DONE # TODO: find a way to avoid changing the distributed files. fixff: @@ -117,5 +117,7 @@ bench_re_freeze.out: bench_re_freeze.vim newtests: $(NEW_TESTS) .vim.res: + @echo "$(VIMPROG)" > vimcmd $(VIMPROG) -u NONE $(NO_PLUGIN) -S runtest.vim $*.vim + @$(DEL) vimcmd diff --git a/src/version.c b/src/version.c index d5623c4cd7..1b55e4fba5 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2168, +/**/ 2167, /**/ 2166, |