changeset 9786:3089f1d99b9e v7.4.2168

commit https://github.com/vim/vim/commit/5b4a3767f6d1760ba1ce103ef3cffb696ece0244 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Aug 6 20:36:34 2016 +0200 patch 7.4.2168 Problem: Not running the startup test on MS-Windows. Solution: Write vimcmd.
author Christian Brabandt <cb@256bit.org>
date Sat, 06 Aug 2016 20:45:06 +0200
parents 6c19fecc82d6
children da34000b61d4
files src/testdir/Make_dos.mak src/testdir/Make_ming.mak src/version.c
diffstat 3 files changed, 11 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -48,21 +48,21 @@ SCRIPTS_BENCH = bench_re_freeze.out
 .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
 
--- 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,