summaryrefslogtreecommitdiff
path: root/src/testdir/Make_dos.mak
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-02-23 19:32:47 +0100
committerBram Moolenaar <Bram@vim.org>2017-02-23 19:32:47 +0100
commit8be2fbb6705dfb41d06d688701803d206c968404 (patch)
tree7b603e040afbf40bc7d13a87c2f433af2c49bc37 /src/testdir/Make_dos.mak
parentb544f3c81f1e6a50322855681ac266ffaa8e313c (diff)
downloadvim-git-8be2fbb6705dfb41d06d688701803d206c968404.tar.gz
patch 8.0.0361: GUI initialisation is not sufficiently testedv8.0.0361
Problem: GUI initialisation is not sufficiently tested. Solution: Add the gui_init test. (Kazuki Kuriyama)
Diffstat (limited to 'src/testdir/Make_dos.mak')
-rw-r--r--src/testdir/Make_dos.mak20
1 files changed, 15 insertions, 5 deletions
diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index c28b1a4b1..8d235b58f 100644
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -38,7 +38,7 @@ win32: nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_WIN32) newtests report
$(DOSTMP_INFILES): $(*B).in
if not exist $(DOSTMP)\NUL md $(DOSTMP)
if exist $@ del $@
- $(VIMPROG) -u dos.vim $(NO_PLUGIN) "+set ff=dos|f $@|wq" $(*B).in
+ $(VIMPROG) -u dos.vim $(NO_INITS) "+set ff=dos|f $@|wq" $(*B).in
# For each input file dostmp/test99.in run the tests.
# This moves test99.in to test99.in.bak temporarily.
@@ -47,7 +47,7 @@ $(TEST_OUTFILES): $(DOSTMP)\$(*B).in
move $(*B).in $(*B).in.bak > nul
copy $(DOSTMP)\$(*B).in $(*B).in > nul
copy $(*B).ok test.ok > nul
- $(VIMPROG) -u dos.vim $(NO_PLUGIN) -s dotest.in $(*B).in
+ $(VIMPROG) -u dos.vim $(NO_INITS) -s dotest.in $(*B).in
-@if exist test.out MOVE /y test.out $(DOSTMP)\$(*B).out > nul
-@if exist $(*B).in.bak move /y $(*B).in.bak $(*B).in > nul
-@if exist test.ok del test.ok
@@ -55,7 +55,7 @@ $(TEST_OUTFILES): $(DOSTMP)\$(*B).in
-@if exist Xfind rd /s /q Xfind
-@del X*
-@if exist viminfo del viminfo
- $(VIMPROG) -u dos.vim $(NO_PLUGIN) "+set ff=unix|f test.out|wq" \
+ $(VIMPROG) -u dos.vim $(NO_INITS) "+set ff=unix|f test.out|wq" \
$(DOSTMP)\$(*B).out
@diff test.out $*.ok & if errorlevel 1 \
( move /y test.out $*.failed > nul \
@@ -104,7 +104,7 @@ benchmark:
bench_re_freeze.out: bench_re_freeze.vim
-if exist benchmark.out del benchmark.out
- $(VIMPROG) -u dos.vim $(NO_PLUGIN) $*.in
+ $(VIMPROG) -u dos.vim $(NO_INITS) $*.in
@IF EXIST benchmark.out ( type benchmark.out )
# New style of tests uses Vim script with assert calls. These are easier
@@ -115,5 +115,15 @@ newtests: $(NEW_TESTS)
.vim.res:
@echo "$(VIMPROG)" > vimcmd
- $(VIMPROG) -u NONE $(NO_PLUGIN) -S runtest.vim $*.vim
+ $(VIMPROG) -u NONE $(NO_INITS) -S runtest.vim $*.vim
+ @del vimcmd
+
+test_gui.res: test_gui.vim
+ @echo "$(VIMPROG)" > vimcmd
+ $(VIMPROG) -u NONE $(NO_INITS) -S runtest.vim $<
+ @del vimcmd
+
+test_gui_init.res: test_gui_init.vim
+ @echo "$(VIMPROG)" > vimcmd
+ $(VIMPROG) -u NONE -U gui_init.vim $(NO_PLUGINS) -S runtest.vim $<
@del vimcmd