Mercurial > vim
annotate src/testdir/Make_dos.mak @ 16150:b23048205589 v8.1.1080
patch 8.1.1080: when a screendump test fails, moving the file is a hassle
commit https://github.com/vim/vim/commit/ef7f0e367eeaf6fb31b1caa0e3de1a4b07e86af3
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Mar 30 15:59:51 2019 +0100
patch 8.1.1080: when a screendump test fails, moving the file is a hassle
Problem: When a screendump test fails, moving the file is a hassle.
Solution: Instead of appending ".failed" to the file name, keep the same
file name but put the screendump in the "failed" directory.
Then the file name only needs to be typed once when moving a
screendump.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 30 Mar 2019 16:00:06 +0100 |
parents | b10ce9e77128 |
children | 8e10cabcde8a |
rev | line source |
---|---|
7 | 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 | 3 # |
4 # Requires a set of Unix tools: echo, diff, etc. | |
5 | |
6 VIMPROG = ..\\vim | |
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 | 12 # Omitted: |
13 # test2 "\\tmp" doesn't work. | |
14 # test10 'errorformat' is different | |
7362
16c67ab8eafd
commit https://github.com/vim/vim/commit/da9888a3f0118ce1ce5acbdcf4720602c2de2a3b
Christian Brabandt <cb@256bit.org>
parents:
7356
diff
changeset
|
15 # test49 fails in various ways |
5116
6cabac58f26f
updated for version 7.3.1301
Bram Moolenaar <bram@vim.org>
parents:
5104
diff
changeset
|
16 # test97 \{ and \$ are not escaped characters. |
7 | 17 |
12662
15f0f9f16cd9
patch 8.0.1209: still too many old style tests
Christian Brabandt <cb@256bit.org>
parents:
12606
diff
changeset
|
18 SCRIPTS = $(SCRIPTS_ALL) $(SCRIPTS_MORE1) $(SCRIPTS_MORE4) |
7 | 19 |
7356
f0eb9aa9eb32
commit https://github.com/vim/vim/commit/a60824308cd9bc192c5d38fc16cccfcf652b40f6
Christian Brabandt <cb@256bit.org>
parents:
7354
diff
changeset
|
20 TEST_OUTFILES = $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_WIN32) $(SCRIPTS_GUI) |
6643 | 21 DOSTMP = dostmp |
22 DOSTMP_OUTFILES = $(TEST_OUTFILES:test=dostmp\test) | |
23 DOSTMP_INFILES = $(DOSTMP_OUTFILES:.out=.in) | |
7 | 24 |
7378
a6c23c3c5880
commit https://github.com/vim/vim/commit/4e5a31c8b3e259605f4d8543aaae68578cf9b0d7
Christian Brabandt <cb@256bit.org>
parents:
7366
diff
changeset
|
25 .SUFFIXES: .in .out .res .vim |
7 | 26 |
7378
a6c23c3c5880
commit https://github.com/vim/vim/commit/4e5a31c8b3e259605f4d8543aaae68578cf9b0d7
Christian Brabandt <cb@256bit.org>
parents:
7366
diff
changeset
|
27 nongui: nolog $(SCRIPTS_FIRST) $(SCRIPTS) newtests report |
6643 | 28 |
29 small: nolog report | |
30 | |
7378
a6c23c3c5880
commit https://github.com/vim/vim/commit/4e5a31c8b3e259605f4d8543aaae68578cf9b0d7
Christian Brabandt <cb@256bit.org>
parents:
7366
diff
changeset
|
31 gui: nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_GUI) newtests report |
7 | 32 |
7378
a6c23c3c5880
commit https://github.com/vim/vim/commit/4e5a31c8b3e259605f4d8543aaae68578cf9b0d7
Christian Brabandt <cb@256bit.org>
parents:
7366
diff
changeset
|
33 win32: nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_WIN32) newtests report |
7 | 34 |
6643 | 35 # Copy the input files to dostmp, changing the fileformat to dos. |
36 $(DOSTMP_INFILES): $(*B).in | |
37 if not exist $(DOSTMP)\NUL md $(DOSTMP) | |
38 if exist $@ del $@ | |
10944
4e2cdce4576c
patch 8.0.0361: GUI initialisation is not sufficiently tested
Christian Brabandt <cb@256bit.org>
parents:
10510
diff
changeset
|
39 $(VIMPROG) -u dos.vim $(NO_INITS) "+set ff=dos|f $@|wq" $(*B).in |
7 | 40 |
6643 | 41 # For each input file dostmp/test99.in run the tests. |
42 # This moves test99.in to test99.in.bak temporarily. | |
43 $(TEST_OUTFILES): $(DOSTMP)\$(*B).in | |
44 -@if exist test.out DEL test.out | |
11150
9f9409588102
patch 8.0.0462: failure of an MS-Windows test may go unnoticed
Christian Brabandt <cb@256bit.org>
parents:
11119
diff
changeset
|
45 -@if exist $(DOSTMP)\$(*B).out DEL $(DOSTMP)\$(*B).out |
10510
dfbe8f74806d
commit https://github.com/vim/vim/commit/29891c4ed4a7d08af1ba1628933a387adf5c1555
Christian Brabandt <cb@256bit.org>
parents:
9786
diff
changeset
|
46 move $(*B).in $(*B).in.bak > nul |
dfbe8f74806d
commit https://github.com/vim/vim/commit/29891c4ed4a7d08af1ba1628933a387adf5c1555
Christian Brabandt <cb@256bit.org>
parents:
9786
diff
changeset
|
47 copy $(DOSTMP)\$(*B).in $(*B).in > nul |
dfbe8f74806d
commit https://github.com/vim/vim/commit/29891c4ed4a7d08af1ba1628933a387adf5c1555
Christian Brabandt <cb@256bit.org>
parents:
9786
diff
changeset
|
48 copy $(*B).ok test.ok > nul |
10944
4e2cdce4576c
patch 8.0.0361: GUI initialisation is not sufficiently tested
Christian Brabandt <cb@256bit.org>
parents:
10510
diff
changeset
|
49 $(VIMPROG) -u dos.vim $(NO_INITS) -s dotest.in $(*B).in |
10510
dfbe8f74806d
commit https://github.com/vim/vim/commit/29891c4ed4a7d08af1ba1628933a387adf5c1555
Christian Brabandt <cb@256bit.org>
parents:
9786
diff
changeset
|
50 -@if exist test.out MOVE /y test.out $(DOSTMP)\$(*B).out > nul |
dfbe8f74806d
commit https://github.com/vim/vim/commit/29891c4ed4a7d08af1ba1628933a387adf5c1555
Christian Brabandt <cb@256bit.org>
parents:
9786
diff
changeset
|
51 -@if exist $(*B).in.bak move /y $(*B).in.bak $(*B).in > nul |
6643 | 52 -@if exist test.ok del test.ok |
53 -@if exist Xdir1 rd /s /q Xdir1 | |
54 -@if exist Xfind rd /s /q Xfind | |
11858
042e634bb8d9
patch 8.0.0809: MS-Windows: tests hang
Christian Brabandt <cb@256bit.org>
parents:
11150
diff
changeset
|
55 -@if exist XfakeHOME rd /s /q XfakeHOME |
7445
e81526d6709f
commit https://github.com/vim/vim/commit/acf92d27c94811e3bd6b84cfd54246e91d44c355
Christian Brabandt <cb@256bit.org>
parents:
7395
diff
changeset
|
56 -@del X* |
6643 | 57 -@if exist viminfo del viminfo |
10944
4e2cdce4576c
patch 8.0.0361: GUI initialisation is not sufficiently tested
Christian Brabandt <cb@256bit.org>
parents:
10510
diff
changeset
|
58 $(VIMPROG) -u dos.vim $(NO_INITS) "+set ff=unix|f test.out|wq" \ |
6643 | 59 $(DOSTMP)\$(*B).out |
60 @diff test.out $*.ok & if errorlevel 1 \ | |
10510
dfbe8f74806d
commit https://github.com/vim/vim/commit/29891c4ed4a7d08af1ba1628933a387adf5c1555
Christian Brabandt <cb@256bit.org>
parents:
9786
diff
changeset
|
61 ( move /y test.out $*.failed > nul \ |
6643 | 62 & del $(DOSTMP)\$(*B).out \ |
63 & echo $* FAILED >> test.log ) \ | |
10510
dfbe8f74806d
commit https://github.com/vim/vim/commit/29891c4ed4a7d08af1ba1628933a387adf5c1555
Christian Brabandt <cb@256bit.org>
parents:
9786
diff
changeset
|
64 else ( move /y test.out $*.out > nul ) |
49 | 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. |
15430
d94901eeb762
patch 8.1.0723: cannot easily run specific test when in src/testdir
Bram Moolenaar <Bram@vim.org>
parents:
14802
diff
changeset
|
69 $(SCRIPTS) $(SCRIPTS_GUI) $(SCRIPTS_WIN32) $(NEW_TESTS_RES): $(SCRIPTS_FIRST) |
7395
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 | 74 @if exist test.log ( type test.log & echo TEST FAILURE & exit /b 1 ) \ |
75 else ( echo ALL DONE ) | |
4934
81e623ff2e55
updated for version 7.3.1212
Bram Moolenaar <bram@vim.org>
parents:
4817
diff
changeset
|
76 |
7 | 77 clean: |
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 | 81 -if exist $(DOSTMP) rd /s /q $(DOSTMP) |
82 -if exist test.in del test.in | |
1358 | 83 -if exist test.ok del test.ok |
84 -if exist small.vim del small.vim | |
85 -if exist tiny.vim del tiny.vim | |
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 |
4946
d10ede931224
updated for version 7.3.1218
Bram Moolenaar <bram@vim.org>
parents:
4934
diff
changeset
|
88 -if exist Xdir1 rd /s /q Xdir1 |
d10ede931224
updated for version 7.3.1218
Bram Moolenaar <bram@vim.org>
parents:
4934
diff
changeset
|
89 -if exist Xfind rd /s /q Xfind |
11858
042e634bb8d9
patch 8.0.0809: MS-Windows: tests hang
Christian Brabandt <cb@256bit.org>
parents:
11150
diff
changeset
|
90 -if exist XfakeHOME rd /s /q XfakeHOME |
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 | 93 -if exist viminfo del viminfo |
6643 | 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 | 96 -if exist benchmark.out del benchmark.out |
11079
50459aeb4773
patch 8.0.0428: git and hg see new files after running tests
Christian Brabandt <cb@256bit.org>
parents:
10946
diff
changeset
|
97 -if exist opt_test.vim del opt_test.vim |
7 | 98 |
4934
81e623ff2e55
updated for version 7.3.1212
Bram Moolenaar <bram@vim.org>
parents:
4817
diff
changeset
|
99 nolog: |
6643 | 100 -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
|
101 -if exist messages del messages |
6328 | 102 |
103 benchmark: | |
104 bench_re_freeze.out | |
105 | |
106 bench_re_freeze.out: bench_re_freeze.vim | |
107 -if exist benchmark.out del benchmark.out | |
10944
4e2cdce4576c
patch 8.0.0361: GUI initialisation is not sufficiently tested
Christian Brabandt <cb@256bit.org>
parents:
10510
diff
changeset
|
108 $(VIMPROG) -u dos.vim $(NO_INITS) $*.in |
6328 | 109 @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
|
110 |
a6c23c3c5880
commit https://github.com/vim/vim/commit/4e5a31c8b3e259605f4d8543aaae68578cf9b0d7
Christian Brabandt <cb@256bit.org>
parents:
7366
diff
changeset
|
111 # 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
|
112 # 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
|
113 # 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
|
114 |
14802
9b04068f7265
patch 8.1.0413: test output is duplicated or missing
Christian Brabandt <cb@256bit.org>
parents:
14339
diff
changeset
|
115 newtests: newtestssilent |
9b04068f7265
patch 8.1.0413: test output is duplicated or missing
Christian Brabandt <cb@256bit.org>
parents:
14339
diff
changeset
|
116 @if exist messages (findstr "SKIPPED FAILED" messages > nul) && type messages |
9b04068f7265
patch 8.1.0413: test output is duplicated or missing
Christian Brabandt <cb@256bit.org>
parents:
14339
diff
changeset
|
117 |
15430
d94901eeb762
patch 8.1.0723: cannot easily run specific test when in src/testdir
Bram Moolenaar <Bram@vim.org>
parents:
14802
diff
changeset
|
118 newtestssilent: $(NEW_TESTS_RES) |
7378
a6c23c3c5880
commit https://github.com/vim/vim/commit/4e5a31c8b3e259605f4d8543aaae68578cf9b0d7
Christian Brabandt <cb@256bit.org>
parents:
7366
diff
changeset
|
119 |
a6c23c3c5880
commit https://github.com/vim/vim/commit/4e5a31c8b3e259605f4d8543aaae68578cf9b0d7
Christian Brabandt <cb@256bit.org>
parents:
7366
diff
changeset
|
120 .vim.res: |
12606
4ecdfa7b4e62
patch 8.0.1181: tests using Vim command fail on MS-Windows
Christian Brabandt <cb@256bit.org>
parents:
11858
diff
changeset
|
121 @echo $(VIMPROG) > vimcmd |
10944
4e2cdce4576c
patch 8.0.0361: GUI initialisation is not sufficiently tested
Christian Brabandt <cb@256bit.org>
parents:
10510
diff
changeset
|
122 $(VIMPROG) -u NONE $(NO_INITS) -S runtest.vim $*.vim |
9786
3089f1d99b9e
commit https://github.com/vim/vim/commit/5b4a3767f6d1760ba1ce103ef3cffb696ece0244
Christian Brabandt <cb@256bit.org>
parents:
8263
diff
changeset
|
123 @del vimcmd |
10944
4e2cdce4576c
patch 8.0.0361: GUI initialisation is not sufficiently tested
Christian Brabandt <cb@256bit.org>
parents:
10510
diff
changeset
|
124 |
4e2cdce4576c
patch 8.0.0361: GUI initialisation is not sufficiently tested
Christian Brabandt <cb@256bit.org>
parents:
10510
diff
changeset
|
125 test_gui.res: test_gui.vim |
12606
4ecdfa7b4e62
patch 8.0.1181: tests using Vim command fail on MS-Windows
Christian Brabandt <cb@256bit.org>
parents:
11858
diff
changeset
|
126 @echo $(VIMPROG) > vimcmd |
10946
0fbba847496d
patch 8.0.0362: tests fail on MS-Windows
Christian Brabandt <cb@256bit.org>
parents:
10944
diff
changeset
|
127 $(VIMPROG) -u NONE $(NO_INITS) -S runtest.vim $*.vim |
10944
4e2cdce4576c
patch 8.0.0361: GUI initialisation is not sufficiently tested
Christian Brabandt <cb@256bit.org>
parents:
10510
diff
changeset
|
128 @del vimcmd |
4e2cdce4576c
patch 8.0.0361: GUI initialisation is not sufficiently tested
Christian Brabandt <cb@256bit.org>
parents:
10510
diff
changeset
|
129 |
4e2cdce4576c
patch 8.0.0361: GUI initialisation is not sufficiently tested
Christian Brabandt <cb@256bit.org>
parents:
10510
diff
changeset
|
130 test_gui_init.res: test_gui_init.vim |
12606
4ecdfa7b4e62
patch 8.0.1181: tests using Vim command fail on MS-Windows
Christian Brabandt <cb@256bit.org>
parents:
11858
diff
changeset
|
131 @echo $(VIMPROG) > vimcmd |
11119
d8a550329a97
patch 8.0.0447: getting font name does not work on X11
Christian Brabandt <cb@256bit.org>
parents:
11083
diff
changeset
|
132 $(VIMPROG) -u gui_preinit.vim -U gui_init.vim $(NO_PLUGINS) -S runtest.vim $*.vim |
10944
4e2cdce4576c
patch 8.0.0361: GUI initialisation is not sufficiently tested
Christian Brabandt <cb@256bit.org>
parents:
10510
diff
changeset
|
133 @del vimcmd |
11079
50459aeb4773
patch 8.0.0428: git and hg see new files after running tests
Christian Brabandt <cb@256bit.org>
parents:
10946
diff
changeset
|
134 |
15432
b10ce9e77128
patch 8.1.0724: build for MinGW fails
Bram Moolenaar <Bram@vim.org>
parents:
15430
diff
changeset
|
135 test_options.res test_alot.res: opt_test.vim |
b10ce9e77128
patch 8.1.0724: build for MinGW fails
Bram Moolenaar <Bram@vim.org>
parents:
15430
diff
changeset
|
136 |
11079
50459aeb4773
patch 8.0.0428: git and hg see new files after running tests
Christian Brabandt <cb@256bit.org>
parents:
10946
diff
changeset
|
137 opt_test.vim: ../option.c gen_opt_test.vim |
11083
ae86651164d7
patch 8.0.0430: options test fails or hangs on MS-Windows
Christian Brabandt <cb@256bit.org>
parents:
11081
diff
changeset
|
138 $(VIMPROG) -u NONE -S gen_opt_test.vim --noplugin --not-a-term ../option.c |