Mercurial > vim

comparison src/testdir/Make_dos.mak @ 7378:a6c23c3c5880 v7.4.994

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/4e5a31c8b3e259605f4d8543aaae68578cf9b0d7 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Dec 29 17:11:15 2015 +0100 patch 7.4.994 Problem: New style tests are not run on MS-Windows. Solution: Add the new style tests.
author Christian Brabandt <cb@256bit.org>
date Tue, 29 Dec 2015 17:15:05 +0100
parents eec1dc8ca160
children 377253525da5
comparison
equal deleted inserted replaced
7377:f44e6074ca7d 7378:a6c23c3c5880
23 TEST_OUTFILES = $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_WIN32) $(SCRIPTS_GUI) 23 TEST_OUTFILES = $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_WIN32) $(SCRIPTS_GUI)
24 DOSTMP = dostmp 24 DOSTMP = dostmp
25 DOSTMP_OUTFILES = $(TEST_OUTFILES:test=dostmp\test) 25 DOSTMP_OUTFILES = $(TEST_OUTFILES:test=dostmp\test)
26 DOSTMP_INFILES = $(DOSTMP_OUTFILES:.out=.in) 26 DOSTMP_INFILES = $(DOSTMP_OUTFILES:.out=.in)
27 27
28 .SUFFIXES: .in .out 28 .SUFFIXES: .in .out .res .vim
29 29
30 # Must run test1 first to create small.vim. 30 # Must run test1 first to create small.vim.
31 $(SCRIPTS) $(SCRIPTS_GUI) $(SCRIPTS_WIN32) $(NEW_TESTS): $(SCRIPTS_FIRST) 31 $(SCRIPTS) $(SCRIPTS_GUI) $(SCRIPTS_WIN32) $(NEW_TESTS): $(SCRIPTS_FIRST)
32 32
33 nongui: nolog $(SCRIPTS_FIRST) $(SCRIPTS) report 33 nongui: nolog $(SCRIPTS_FIRST) $(SCRIPTS) newtests report
34 34
35 small: nolog report 35 small: nolog report
36 36
37 gui: nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_GUI) report 37 gui: nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_GUI) newtests report
38 38
39 win32: nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_WIN32) report 39 win32: nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_WIN32) newtests report
40 40
41 # Copy the input files to dostmp, changing the fileformat to dos. 41 # Copy the input files to dostmp, changing the fileformat to dos.
42 $(DOSTMP_INFILES): $(*B).in 42 $(DOSTMP_INFILES): $(*B).in
43 if not exist $(DOSTMP)\NUL md $(DOSTMP) 43 if not exist $(DOSTMP)\NUL md $(DOSTMP)
44 if exist $@ del $@ 44 if exist $@ del $@
74 else ( echo ALL DONE ) 74 else ( echo ALL DONE )
75 75
76 clean: 76 clean:
77 -del *.out 77 -del *.out
78 -del *.failed 78 -del *.failed
79 -del *.res
79 -if exist $(DOSTMP) rd /s /q $(DOSTMP) 80 -if exist $(DOSTMP) rd /s /q $(DOSTMP)
80 -if exist test.in del test.in 81 -if exist test.in del test.in
81 -if exist test.ok del test.ok 82 -if exist test.ok del test.ok
82 -if exist small.vim del small.vim 83 -if exist small.vim del small.vim
83 -if exist tiny.vim del tiny.vim 84 -if exist tiny.vim del tiny.vim
87 -del X* 88 -del X*
88 -if exist Xdir1 rd /s /q Xdir1 89 -if exist Xdir1 rd /s /q Xdir1
89 -if exist Xfind rd /s /q Xfind 90 -if exist Xfind rd /s /q Xfind
90 -if exist viminfo del viminfo 91 -if exist viminfo del viminfo
91 -if exist test.log del test.log 92 -if exist test.log del test.log
93 -if exist messages del messages
92 -if exist benchmark.out del benchmark.out 94 -if exist benchmark.out del benchmark.out
93 95
94 nolog: 96 nolog:
95 -if exist test.log del test.log 97 -if exist test.log del test.log
98 -if exist messages del messages
96 99
97 benchmark: 100 benchmark:
98 bench_re_freeze.out 101 bench_re_freeze.out
99 102
100 bench_re_freeze.out: bench_re_freeze.vim 103 bench_re_freeze.out: bench_re_freeze.vim
101 -if exist benchmark.out del benchmark.out 104 -if exist benchmark.out del benchmark.out
102 $(VIMPROG) -u dos.vim -U NONE --noplugin $*.in 105 $(VIMPROG) -u dos.vim -U NONE --noplugin $*.in
103 @IF EXIST benchmark.out ( type benchmark.out ) 106 @IF EXIST benchmark.out ( type benchmark.out )
107
108 # New style of tests uses Vim script with assert calls. These are easier
109 # to write and a lot easier to read and debug.
110 # Limitation: Only works with the +eval feature.
111
112 newtests: $(NEW_TESTS)
113
114 .vim.res:
115 $(VIMPROG) -u NONE -S runtest.vim $*.vim