Mercurial > vim

comparison src/testdir/Makefile @ 7313:2062247be2d0 v7.4.962

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/3f12a2421bda43a4e48c822541b75f72ee11125a Author: Bram Moolenaar <Bram@vim.org> Date: Sat Dec 5 20:56:57 2015 +0100 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.
author Christian Brabandt <cb@256bit.org>
date Sat, 05 Dec 2015 21:00:05 +0100
parents 979f8a595326
children 5ac8ee7bf4ff
comparison
equal deleted inserted replaced
7312:ae9e4a4e5fd4 7313:2062247be2d0
1 # 1 #
2 # Makefile to run all tests for Vim 2 # Makefile to run all tests for Vim
3 # 3 #
4 4
5 # Use console or GUI.
5 VIMPROG = ../vim 6 VIMPROG = ../vim
7 # VIMPROG = ../gvim
8
6 SCRIPTSOURCE = ../../runtime 9 SCRIPTSOURCE = ../../runtime
7 10
8 # Uncomment this line to use valgrind for memory leaks and extra warnings. 11 # Uncomment this line to use valgrind for memory leaks and extra warnings.
9 # The output goes into a file "valgrind.testN" 12 # The output goes into a file "valgrind.testN"
10 # Vim should be compiled with EXITFREE to avoid false warnings. 13 # Vim should be compiled with EXITFREE to avoid false warnings.
89 @/bin/sh -c "if test -f test.log; \ 92 @/bin/sh -c "if test -f test.log; \
90 then cat test.log; echo TEST FAILURE; exit 1; \ 93 then cat test.log; echo TEST FAILURE; exit 1; \
91 else echo ALL DONE; \ 94 else echo ALL DONE; \
92 fi" 95 fi"
93 96
94 $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG) 97 $(SCRIPTS) $(SCRIPTS_GUI) $(NEW_TESTS): $(VIMPROG)
95 98
96 RM_ON_RUN = test.out X* viminfo 99 RM_ON_RUN = test.out X* viminfo
97 RM_ON_START = tiny.vim small.vim mbyte.vim mzscheme.vim lua.vim test.ok benchmark.out 100 RM_ON_START = tiny.vim small.vim mbyte.vim mzscheme.vim lua.vim test.ok benchmark.out
98 RUN_VIM = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in 101 RUN_VIM = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(VIMPROG) -f -u unix.vim -U NONE --noplugin -s dotest.in
99 102
100 clean: 103 clean:
101 -rm -rf *.out *.failed *.res *.rej *.orig test.log $(RM_ON_RUN) $(RM_ON_START) valgrind.* 104 -rm -rf *.out *.failed *.res *.rej *.orig test.log $(RM_ON_RUN) $(RM_ON_START) valgrind.*
102 105
103 test1.out: test1.in 106 test1.out: test1.in
163 166
164 167
165 # New style of tests uses Vim script with assert calls. These are easier 168 # New style of tests uses Vim script with assert calls. These are easier
166 # to write and a lot easier to read and debug. 169 # to write and a lot easier to read and debug.
167 # Limitation: Only works with the +eval feature. 170 # Limitation: Only works with the +eval feature.
168 RUN_VIMTEST = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(VIMPROG) -u unix.vim -U NONE --noplugin 171 RUN_VIMTEST = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(VIMPROG) -f -u unix.vim -U NONE --noplugin
169 172
170 newtests: $(NEW_TESTS) 173 newtests: $(NEW_TESTS)
171 174
172 .vim.res: 175 .vim.res:
173 $(RUN_VIMTEST) -u runtest.vim $*.vim 176 $(RUN_VIMTEST) -u runtest.vim $*.vim