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 | |
| parent | 9dc2ce398bb3456cc8f590ef0260459798b34d2a (diff) | |
| download | vim-git-3f12a2421bda43a4e48c822541b75f72ee11125a.tar.gz | |
patch 7.4.962v7.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.
| -rw-r--r-- | src/Makefile | 11 | ||||
| -rw-r--r-- | src/testdir/Makefile | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 18 insertions, 4 deletions
diff --git a/src/Makefile b/src/Makefile index ab1014f9e..3f29d461f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1945,7 +1945,16 @@ test1 \ test80 test81 test82 test83 test84 test85 test86 test87 test88 test89 \ test90 test91 test92 test93 test94 test95 test96 test97 test98 test99 \ test100 test101 test102 test103 test104 test105 test106 test107: - cd testdir; rm $@.out; $(MAKE) -f Makefile $@.out VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE) + cd testdir; rm -f $@.out; $(MAKE) -f Makefile $@.out VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE) + +test_assert \ + test_sort \ + test_undolevels \ + test_alot: + cd testdir; rm -f $@.res; $(MAKE) -f Makefile $@.res VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE) + +newtests: + cd testdir; rm -f $@.res; $(MAKE) -f Makefile newtests VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE) testclean: cd testdir; $(MAKE) -f Makefile clean 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) diff --git a/src/version.c b/src/version.c index 514f8be76..af22fb028 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 962, +/**/ 961, /**/ 960, |