summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-10-07 21:05:18 +0200
committerBram Moolenaar <Bram@vim.org>2017-10-07 21:05:18 +0200
commit4635e11c6bd63d8be90a2d9455802c6e7bde28f5 (patch)
tree2be7ba8d2360c0d389d9b04362c045ba2b7e2a16
parent75f69e5a183e00cb5aa05d43c1ecf3b7dead7a98 (diff)
downloadvim-git-4635e11c6bd63d8be90a2d9455802c6e7bde28f5.tar.gz
patch 8.0.1181: tests using Vim command fail on MS-Windowsv8.0.1181
Problem: Tests using Vim command fail on MS-Windows. Solution: Do not add quotes around the Vim command.
-rw-r--r--src/testdir/Make_dos.mak6
-rw-r--r--src/testdir/Make_ming.mak6
-rw-r--r--src/version.c2
3 files changed, 8 insertions, 6 deletions
diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index 2c00a156f..05978ade2 100644
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -118,17 +118,17 @@ bench_re_freeze.out: bench_re_freeze.vim
newtests: $(NEW_TESTS)
.vim.res:
- @echo "$(VIMPROG)" > vimcmd
+ @echo $(VIMPROG) > vimcmd
$(VIMPROG) -u NONE $(NO_INITS) -S runtest.vim $*.vim
@del vimcmd
test_gui.res: test_gui.vim
- @echo "$(VIMPROG)" > vimcmd
+ @echo $(VIMPROG) > vimcmd
$(VIMPROG) -u NONE $(NO_INITS) -S runtest.vim $*.vim
@del vimcmd
test_gui_init.res: test_gui_init.vim
- @echo "$(VIMPROG)" > vimcmd
+ @echo $(VIMPROG) > vimcmd
$(VIMPROG) -u gui_preinit.vim -U gui_init.vim $(NO_PLUGINS) -S runtest.vim $*.vim
@del vimcmd
diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
index 3d7cf3fc6..c5a5dc01d 100644
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -120,17 +120,17 @@ bench_re_freeze.out: bench_re_freeze.vim
newtests: $(NEW_TESTS)
.vim.res:
- @echo "$(VIMPROG)" > vimcmd
+ @echo $(VIMPROG) > vimcmd
$(VIMPROG) -u NONE $(NO_INITS) -S runtest.vim $*.vim
@$(DEL) vimcmd
test_gui.res: test_gui.vim
- @echo "$(VIMPROG)" > vimcmd
+ @echo $(VIMPROG) > vimcmd
$(VIMPROG) -u NONE $(NO_INITS) -S runtest.vim $<
@$(DEL) vimcmd
test_gui_init.res: test_gui_init.vim
- @echo "$(VIMPROG)" > vimcmd
+ @echo $(VIMPROG) > vimcmd
$(VIMPROG) -u gui_preinit.vim -U gui_init.vim $(NO_PLUGINS) -S runtest.vim $<
@$(DEL) vimcmd
diff --git a/src/version.c b/src/version.c
index 21e9e00b4..0ca3f055a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1181,
+/**/
1180,
/**/
1179,