diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-12-05 20:56:57 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-12-05 20:56:57 +0100 |
| commit | 3f12a2421bda43a4e48c822541b75f72ee11125a (patch) | |
| tree | a0c2d4f0413d59511d1f17b286ed378c4663a545 /src/testdir | |
| parent | 9dc2ce398bb3456cc8f590ef0260459798b34d2a (diff) | |
| download | vim-3f12a2421bda43a4e48c822541b75f72ee11125a.zip | |
patch 7.4.962
Problem: Cannot run the tests with gvim. Cannot run individual new stests.
Solution: Add the -f flag. Add new test targets in Makefile.
Diffstat (limited to 'src/testdir')
| -rw-r--r-- | src/testdir/Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/testdir/Makefile b/src/testdir/Makefile index 932150697..83350aa63 100644 --- a/src/testdir/Makefile +++ b/src/testdir/Makefile @@ -2,7 +2,10 @@ # Makefile to run all tests for Vim # +# Use console or GUI. VIMPROG = ../vim +# VIMPROG = ../gvim + SCRIPTSOURCE = ../../runtime # Uncomment this line to use valgrind for memory leaks and extra warnings. @@ -91,11 +94,11 @@ report: else echo ALL DONE; \ fi" -$(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG) +$(SCRIPTS) $(SCRIPTS_GUI) $(NEW_TESTS): $(VIMPROG) 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) -u unix.vim -U NONE --noplugin -s dotest.in +RUN_VIM = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(VIMPROG) -f -u unix.vim -U NONE --noplugin -s dotest.in clean: -rm -rf *.out *.failed *.res *.rej *.orig test.log $(RM_ON_RUN) $(RM_ON_START) valgrind.* @@ -165,7 +168,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) -u unix.vim -U NONE --noplugin +RUN_VIMTEST = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(VIMPROG) -f -u unix.vim -U NONE --noplugin newtests: $(NEW_TESTS) |