annotate src/testdir/Make_dos.mak @ 9009:149d976650a1 v7.4.1790

commit https://github.com/vim/vim/commit/6231cb8b5b208becf088531816027001acc754e5 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Apr 26 19:42:42 2016 +0200 patch 7.4.1790 Problem: Leading white space in a job command matters. (Andrew Stewart) Solution: Skip leading white space.
author Christian Brabandt <cb@256bit.org>
date Tue, 26 Apr 2016 19:45:05 +0200
parents 96c0100f22f1
children 3089f1d99b9e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1 #
2440
fc695854c33a Correct comments in testdir makefiles. (John Beckett)
Bram Moolenaar <bram@vim.org>
parents: 2232
diff changeset
2 # Makefile to run all tests for Vim, on Dos-like machines.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3 #
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4 # Requires a set of Unix tools: echo, diff, etc.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6 VIMPROG = ..\\vim
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7
7366
eec1dc8ca160 commit https://github.com/vim/vim/commit/40bbceee2213a6fa8fdc1d3f3920d61fb5370803
Christian Brabandt <cb@256bit.org>
parents: 7362
diff changeset
8 default: nongui
eec1dc8ca160 commit https://github.com/vim/vim/commit/40bbceee2213a6fa8fdc1d3f3920d61fb5370803
Christian Brabandt <cb@256bit.org>
parents: 7362
diff changeset
9
7354
81dc9e30aad6 commit https://github.com/vim/vim/commit/7b6156f4cd4027b664a916ba546e9b05d4c49e11
Christian Brabandt <cb@256bit.org>
parents: 7350
diff changeset
10 !include Make_all.mak
81dc9e30aad6 commit https://github.com/vim/vim/commit/7b6156f4cd4027b664a916ba546e9b05d4c49e11
Christian Brabandt <cb@256bit.org>
parents: 7350
diff changeset
11
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
12 # Omitted:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
13 # test2 "\\tmp" doesn't work.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
14 # test10 'errorformat' is different
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
15 # test12 can't unlink a swap file
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
16 # test25 uses symbolic link
7362
16c67ab8eafd commit https://github.com/vim/vim/commit/da9888a3f0118ce1ce5acbdcf4720602c2de2a3b
Christian Brabandt <cb@256bit.org>
parents: 7356
diff changeset
17 # test49 fails in various ways
5116
6cabac58f26f updated for version 7.3.1301
Bram Moolenaar <bram@vim.org>
parents: 5104
diff changeset
18 # test97 \{ and \$ are not escaped characters.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
19
7354
81dc9e30aad6 commit https://github.com/vim/vim/commit/7b6156f4cd4027b664a916ba546e9b05d4c49e11
Christian Brabandt <cb@256bit.org>
parents: 7350
diff changeset
20 SCRIPTS = $(SCRIPTS_ALL) $(SCRIPTS_MORE1) $(SCRIPTS_MORE3) $(SCRIPTS_MORE4)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
21
7356
f0eb9aa9eb32 commit https://github.com/vim/vim/commit/a60824308cd9bc192c5d38fc16cccfcf652b40f6
Christian Brabandt <cb@256bit.org>
parents: 7354
diff changeset
22 TEST_OUTFILES = $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_WIN32) $(SCRIPTS_GUI)
6643
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
23 DOSTMP = dostmp
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
24 DOSTMP_OUTFILES = $(TEST_OUTFILES:test=dostmp\test)
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
25 DOSTMP_INFILES = $(DOSTMP_OUTFILES:.out=.in)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
26
7378
a6c23c3c5880 commit https://github.com/vim/vim/commit/4e5a31c8b3e259605f4d8543aaae68578cf9b0d7
Christian Brabandt <cb@256bit.org>
parents: 7366
diff changeset
27 .SUFFIXES: .in .out .res .vim
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
28
7378
a6c23c3c5880 commit https://github.com/vim/vim/commit/4e5a31c8b3e259605f4d8543aaae68578cf9b0d7
Christian Brabandt <cb@256bit.org>
parents: 7366
diff changeset
29 nongui: nolog $(SCRIPTS_FIRST) $(SCRIPTS) newtests report
6643
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
30
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
31 small: nolog report
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
32
7378
a6c23c3c5880 commit https://github.com/vim/vim/commit/4e5a31c8b3e259605f4d8543aaae68578cf9b0d7
Christian Brabandt <cb@256bit.org>
parents: 7366
diff changeset
33 gui: nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_GUI) newtests report
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
34
7378
a6c23c3c5880 commit https://github.com/vim/vim/commit/4e5a31c8b3e259605f4d8543aaae68578cf9b0d7
Christian Brabandt <cb@256bit.org>
parents: 7366
diff changeset
35 win32: nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_WIN32) newtests report
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
36
6643
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
37 # Copy the input files to dostmp, changing the fileformat to dos.
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
38 $(DOSTMP_INFILES): $(*B).in
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
39 if not exist $(DOSTMP)\NUL md $(DOSTMP)
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
40 if exist $@ del $@
8253
1b6a589a0efc commit https://github.com/vim/vim/commit/49c39ff678e2ba9f7dc280b25368e12084a610cf
Christian Brabandt <cb@256bit.org>
parents: 7645
diff changeset
41 $(VIMPROG) -u dos.vim $(NO_PLUGIN) "+set ff=dos|f $@|wq" $(*B).in
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
42
6643
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
43 # For each input file dostmp/test99.in run the tests.
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
44 # This moves test99.in to test99.in.bak temporarily.
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
45 $(TEST_OUTFILES): $(DOSTMP)\$(*B).in
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
46 -@if exist test.out DEL test.out
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
47 move $(*B).in $(*B).in.bak
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
48 copy $(DOSTMP)\$(*B).in $(*B).in
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
49 copy $(*B).ok test.ok
8253
1b6a589a0efc commit https://github.com/vim/vim/commit/49c39ff678e2ba9f7dc280b25368e12084a610cf
Christian Brabandt <cb@256bit.org>
parents: 7645
diff changeset
50 $(VIMPROG) -u dos.vim $(NO_PLUGIN) -s dotest.in $(*B).in
6643
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
51 -@if exist test.out MOVE /y test.out $(DOSTMP)\$(*B).out
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
52 -@if exist $(*B).in.bak move /y $(*B).in.bak $(*B).in
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
53 -@if exist test.ok del test.ok
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
54 -@if exist Xdir1 rd /s /q Xdir1
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
55 -@if exist Xfind rd /s /q Xfind
7445
e81526d6709f commit https://github.com/vim/vim/commit/acf92d27c94811e3bd6b84cfd54246e91d44c355
Christian Brabandt <cb@256bit.org>
parents: 7395
diff changeset
56 -@del X*
6643
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
57 -@if exist viminfo del viminfo
8253
1b6a589a0efc commit https://github.com/vim/vim/commit/49c39ff678e2ba9f7dc280b25368e12084a610cf
Christian Brabandt <cb@256bit.org>
parents: 7645
diff changeset
58 $(VIMPROG) -u dos.vim $(NO_PLUGIN) "+set ff=unix|f test.out|wq" \
6643
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
59 $(DOSTMP)\$(*B).out
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
60 @diff test.out $*.ok & if errorlevel 1 \
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
61 ( move /y test.out $*.failed \
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
62 & del $(DOSTMP)\$(*B).out \
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
63 & echo $* FAILED >> test.log ) \
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
64 else ( move /y test.out $*.out )
49
10286edc333c updated for version 7.0028
vimboss
parents: 40
diff changeset
65
7395
377253525da5 commit https://github.com/vim/vim/commit/604619784c7f9007a883c123231d080598bd49f5
Christian Brabandt <cb@256bit.org>
parents: 7378
diff changeset
66 # Must run test1 first to create small.vim.
377253525da5 commit https://github.com/vim/vim/commit/604619784c7f9007a883c123231d080598bd49f5
Christian Brabandt <cb@256bit.org>
parents: 7378
diff changeset
67 # This rule must come after the one that copies the input files to dostmp to
377253525da5 commit https://github.com/vim/vim/commit/604619784c7f9007a883c123231d080598bd49f5
Christian Brabandt <cb@256bit.org>
parents: 7378
diff changeset
68 # allow for running an individual test.
377253525da5 commit https://github.com/vim/vim/commit/604619784c7f9007a883c123231d080598bd49f5
Christian Brabandt <cb@256bit.org>
parents: 7378
diff changeset
69 $(SCRIPTS) $(SCRIPTS_GUI) $(SCRIPTS_WIN32) $(NEW_TESTS): $(SCRIPTS_FIRST)
377253525da5 commit https://github.com/vim/vim/commit/604619784c7f9007a883c123231d080598bd49f5
Christian Brabandt <cb@256bit.org>
parents: 7378
diff changeset
70
4934
81e623ff2e55 updated for version 7.3.1212
Bram Moolenaar <bram@vim.org>
parents: 4817
diff changeset
71 report:
81e623ff2e55 updated for version 7.3.1212
Bram Moolenaar <bram@vim.org>
parents: 4817
diff changeset
72 @echo ""
81e623ff2e55 updated for version 7.3.1212
Bram Moolenaar <bram@vim.org>
parents: 4817
diff changeset
73 @echo Test results:
6643
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
74 @if exist test.log ( type test.log & echo TEST FAILURE & exit /b 1 ) \
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
75 else ( echo ALL DONE )
4934
81e623ff2e55 updated for version 7.3.1212
Bram Moolenaar <bram@vim.org>
parents: 4817
diff changeset
76
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
77 clean:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
78 -del *.out
4946
d10ede931224 updated for version 7.3.1218
Bram Moolenaar <bram@vim.org>
parents: 4934
diff changeset
79 -del *.failed
7378
a6c23c3c5880 commit https://github.com/vim/vim/commit/4e5a31c8b3e259605f4d8543aaae68578cf9b0d7
Christian Brabandt <cb@256bit.org>
parents: 7366
diff changeset
80 -del *.res
6643
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
81 -if exist $(DOSTMP) rd /s /q $(DOSTMP)
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
82 -if exist test.in del test.in
1358
9656552c468d updated for version 7.1-072
vimboss
parents: 1327
diff changeset
83 -if exist test.ok del test.ok
9656552c468d updated for version 7.1-072
vimboss
parents: 1327
diff changeset
84 -if exist small.vim del small.vim
9656552c468d updated for version 7.1-072
vimboss
parents: 1327
diff changeset
85 -if exist tiny.vim del tiny.vim
9656552c468d updated for version 7.1-072
vimboss
parents: 1327
diff changeset
86 -if exist mbyte.vim del mbyte.vim
2101
8ae4de2d02af updated for version 7.2.384
Bram Moolenaar <bram@zimbu.org>
parents: 2050
diff changeset
87 -if exist mzscheme.vim del mzscheme.vim
3855
1cc37b8cfaa1 updated for version 7.3.684
Bram Moolenaar <bram@vim.org>
parents: 3618
diff changeset
88 -if exist lua.vim del lua.vim
4946
d10ede931224 updated for version 7.3.1218
Bram Moolenaar <bram@vim.org>
parents: 4934
diff changeset
89 -if exist Xdir1 rd /s /q Xdir1
d10ede931224 updated for version 7.3.1218
Bram Moolenaar <bram@vim.org>
parents: 4934
diff changeset
90 -if exist Xfind rd /s /q Xfind
7445
e81526d6709f commit https://github.com/vim/vim/commit/acf92d27c94811e3bd6b84cfd54246e91d44c355
Christian Brabandt <cb@256bit.org>
parents: 7395
diff changeset
91 -del X*
7631
ad3e9ea845e7 commit https://github.com/vim/vim/commit/d0232917ced39ff4838665fbcf379d5116a91aa3
Christian Brabandt <cb@256bit.org>
parents: 7623
diff changeset
92 -for /d %i in (X*) do @rmdir /s/q %i
1358
9656552c468d updated for version 7.1-072
vimboss
parents: 1327
diff changeset
93 -if exist viminfo del viminfo
6643
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
94 -if exist test.log del test.log
7378
a6c23c3c5880 commit https://github.com/vim/vim/commit/4e5a31c8b3e259605f4d8543aaae68578cf9b0d7
Christian Brabandt <cb@256bit.org>
parents: 7366
diff changeset
95 -if exist messages del messages
6330
24ee7a7a26b1 updated for version 7.4.498
Bram Moolenaar <bram@vim.org>
parents: 6328
diff changeset
96 -if exist benchmark.out del benchmark.out
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
97
4934
81e623ff2e55 updated for version 7.3.1212
Bram Moolenaar <bram@vim.org>
parents: 4817
diff changeset
98 nolog:
6643
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
99 -if exist test.log del test.log
7378
a6c23c3c5880 commit https://github.com/vim/vim/commit/4e5a31c8b3e259605f4d8543aaae68578cf9b0d7
Christian Brabandt <cb@256bit.org>
parents: 7366
diff changeset
100 -if exist messages del messages
6328
adfbffe1e642 updated for version 7.4.497
Bram Moolenaar <bram@vim.org>
parents: 6307
diff changeset
101
adfbffe1e642 updated for version 7.4.497
Bram Moolenaar <bram@vim.org>
parents: 6307
diff changeset
102 benchmark:
adfbffe1e642 updated for version 7.4.497
Bram Moolenaar <bram@vim.org>
parents: 6307
diff changeset
103 bench_re_freeze.out
adfbffe1e642 updated for version 7.4.497
Bram Moolenaar <bram@vim.org>
parents: 6307
diff changeset
104
adfbffe1e642 updated for version 7.4.497
Bram Moolenaar <bram@vim.org>
parents: 6307
diff changeset
105 bench_re_freeze.out: bench_re_freeze.vim
adfbffe1e642 updated for version 7.4.497
Bram Moolenaar <bram@vim.org>
parents: 6307
diff changeset
106 -if exist benchmark.out del benchmark.out
8253
1b6a589a0efc commit https://github.com/vim/vim/commit/49c39ff678e2ba9f7dc280b25368e12084a610cf
Christian Brabandt <cb@256bit.org>
parents: 7645
diff changeset
107 $(VIMPROG) -u dos.vim $(NO_PLUGIN) $*.in
6328
adfbffe1e642 updated for version 7.4.497
Bram Moolenaar <bram@vim.org>
parents: 6307
diff changeset
108 @IF EXIST benchmark.out ( type benchmark.out )
7378
a6c23c3c5880 commit https://github.com/vim/vim/commit/4e5a31c8b3e259605f4d8543aaae68578cf9b0d7
Christian Brabandt <cb@256bit.org>
parents: 7366
diff changeset
109
a6c23c3c5880 commit https://github.com/vim/vim/commit/4e5a31c8b3e259605f4d8543aaae68578cf9b0d7
Christian Brabandt <cb@256bit.org>
parents: 7366
diff changeset
110 # New style of tests uses Vim script with assert calls. These are easier
a6c23c3c5880 commit https://github.com/vim/vim/commit/4e5a31c8b3e259605f4d8543aaae68578cf9b0d7
Christian Brabandt <cb@256bit.org>
parents: 7366
diff changeset
111 # to write and a lot easier to read and debug.
a6c23c3c5880 commit https://github.com/vim/vim/commit/4e5a31c8b3e259605f4d8543aaae68578cf9b0d7
Christian Brabandt <cb@256bit.org>
parents: 7366
diff changeset
112 # Limitation: Only works with the +eval feature.
a6c23c3c5880 commit https://github.com/vim/vim/commit/4e5a31c8b3e259605f4d8543aaae68578cf9b0d7
Christian Brabandt <cb@256bit.org>
parents: 7366
diff changeset
113
a6c23c3c5880 commit https://github.com/vim/vim/commit/4e5a31c8b3e259605f4d8543aaae68578cf9b0d7
Christian Brabandt <cb@256bit.org>
parents: 7366
diff changeset
114 newtests: $(NEW_TESTS)
a6c23c3c5880 commit https://github.com/vim/vim/commit/4e5a31c8b3e259605f4d8543aaae68578cf9b0d7
Christian Brabandt <cb@256bit.org>
parents: 7366
diff changeset
115
a6c23c3c5880 commit https://github.com/vim/vim/commit/4e5a31c8b3e259605f4d8543aaae68578cf9b0d7
Christian Brabandt <cb@256bit.org>
parents: 7366
diff changeset
116 .vim.res:
8263
96c0100f22f1 commit https://github.com/vim/vim/commit/0c0dac1fb134309462b263fd5347d9232bfe36ed
Christian Brabandt <cb@256bit.org>
parents: 8253
diff changeset
117 $(VIMPROG) -u NONE $(NO_PLUGIN) -S runtest.vim $*.vim