summaryrefslogtreecommitdiffstats
path: root/src/testdir/Makefile
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/Makefile
parentb544f3c81f1e6a50322855681ac266ffaa8e313c (diff)
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/Makefile')
-rw-r--r--src/testdir/Makefile16
1 files changed, 13 insertions, 3 deletions
diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index bb0249ac7c..ac75e43577 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -52,7 +52,7 @@ $(SCRIPTS) $(SCRIPTS_GUI) $(NEW_TESTS): $(SCRIPTS_FIRST)
RM_ON_RUN = test.out X* viminfo
RM_ON_START = tiny.vim small.vim mbyte.vim mzscheme.vim lua.vim test.ok benchmark.out
-RUN_VIM = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(VIMPROG) -f $(GUI_FLAG) -u unix.vim $(NO_PLUGIN) -s dotest.in
+RUN_VIM = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(VIMPROG) -f $(GUI_FLAG) -u unix.vim $(NO_INITS) -s dotest.in
clean:
-rm -rf *.out *.failed *.res *.rej *.orig test.log messages $(RM_ON_RUN) $(RM_ON_START) valgrind.*
@@ -118,7 +118,7 @@ nolog:
# New style of tests uses Vim script with assert calls. These are easier
# to write and a lot easier to read and debug.
# Limitation: Only works with the +eval feature.
-RUN_VIMTEST = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(VIMPROG) -f $(GUI_FLAG) -u unix.vim $(NO_PLUGIN)
+RUN_VIMTEST = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(VIMPROG) -f $(GUI_FLAG) -u unix.vim
newtests: newtestssilent
@/bin/sh -c "if test -f messages && grep -q 'SKIPPED\|FAILED' messages; then cat messages && if test -f test.log; then cat test.log; fi ; fi"
@@ -128,5 +128,15 @@ newtestssilent: $(NEW_TESTS)
.vim.res:
@echo "$(RUN_VIMTEST)" > vimcmd
- $(RUN_VIMTEST) -U NONE -S runtest.vim $*.vim
+ $(RUN_VIMTEST) $(NO_INITS) -S runtest.vim $*.vim
+ @rm vimcmd
+
+test_gui.res: test_gui.vim
+ @echo "$(RUN_GVIMTEST)" > vimcmd
+ $(RUN_VIMTEST) -u NONE $(NO_INITS) -S runtest.vim $<
+ @rm vimcmd
+
+test_gui_init.res: test_gui_init.vim
+ @echo "$(RUN_GVIMTEST_WITH_GVIMRC)" > vimcmd
+ $(RUN_VIMTEST) -u NONE -U gui_init.vim $(NO_PLUGINS) -S runtest.vim $<
@rm vimcmd