Mercurial > vim
annotate src/testdir/Make_dos.mak @ 21741:baccf9e06efe v8.2.1420
patch 8.2.1420: test 49 is old style
Commit: https://github.com/vim/vim/commit/f7c4d83609acdfe0e4d0fec9413697ac97c0c3f9
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Aug 11 20:42:19 2020 +0200
patch 8.2.1420: test 49 is old style
Problem: Test 49 is old style.
Solution: Convert remaining parts to new style. Remove obsolete items.
(Yegappan Lakshmanan, closes #6683)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Tue, 11 Aug 2020 20:45:05 +0200 |
parents | dc1c26547a42 |
children | 30bdd2e4a6f9 |
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 |
21741
baccf9e06efe
patch 8.2.1420: test 49 is old style
Bram Moolenaar <Bram@vim.org>
parents:
21532
diff
changeset
|
12 TEST_OUTFILES = $(SCRIPTS_FIRST) |
6643 | 13 DOSTMP = dostmp |
14 DOSTMP_OUTFILES = $(TEST_OUTFILES:test=dostmp\test) | |
15 DOSTMP_INFILES = $(DOSTMP_OUTFILES:.out=.in) | |
7 | 16 |
7378
a6c23c3c5880
commit https://github.com/vim/vim/commit/4e5a31c8b3e259605f4d8543aaae68578cf9b0d7
Christian Brabandt <cb@256bit.org>
parents:
7366
diff
changeset
|
17 .SUFFIXES: .in .out .res .vim |
7 | 18 |
21741
baccf9e06efe
patch 8.2.1420: test 49 is old style
Bram Moolenaar <Bram@vim.org>
parents:
21532
diff
changeset
|
19 nongui: nolog $(SCRIPTS_FIRST) newtests report |
6643 | 20 |
21 small: nolog report | |
22 | |
21741
baccf9e06efe
patch 8.2.1420: test 49 is old style
Bram Moolenaar <Bram@vim.org>
parents:
21532
diff
changeset
|
23 gui: nolog $(SCRIPTS_FIRST) newtests report |
7 | 24 |
21741
baccf9e06efe
patch 8.2.1420: test 49 is old style
Bram Moolenaar <Bram@vim.org>
parents:
21532
diff
changeset
|
25 win32: nolog $(SCRIPTS_FIRST) newtests report |
7 | 26 |
6643 | 27 # Copy the input files to dostmp, changing the fileformat to dos. |
28 $(DOSTMP_INFILES): $(*B).in | |
29 if not exist $(DOSTMP)\NUL md $(DOSTMP) | |
30 if exist $@ del $@ | |
10944
4e2cdce4576c
patch 8.0.0361: GUI initialisation is not sufficiently tested
Christian Brabandt <cb@256bit.org>
parents:
10510
diff
changeset
|
31 $(VIMPROG) -u dos.vim $(NO_INITS) "+set ff=dos|f $@|wq" $(*B).in |
7 | 32 |
6643 | 33 # For each input file dostmp/test99.in run the tests. |
34 # This moves test99.in to test99.in.bak temporarily. | |
35 $(TEST_OUTFILES): $(DOSTMP)\$(*B).in | |
36 -@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
|
37 -@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
|
38 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
|
39 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
|
40 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
|
41 $(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
|
42 -@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
|
43 -@if exist $(*B).in.bak move /y $(*B).in.bak $(*B).in > nul |
6643 | 44 -@if exist test.ok del test.ok |
45 -@if exist Xdir1 rd /s /q Xdir1 | |
46 -@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
|
47 -@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
|
48 -@del X* |
6643 | 49 -@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
|
50 $(VIMPROG) -u dos.vim $(NO_INITS) "+set ff=unix|f test.out|wq" \ |
6643 | 51 $(DOSTMP)\$(*B).out |
52 @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
|
53 ( move /y test.out $*.failed > nul \ |
6643 | 54 & del $(DOSTMP)\$(*B).out \ |
55 & echo $* FAILED >> test.log ) \ | |
10510
dfbe8f74806d
commit https://github.com/vim/vim/commit/29891c4ed4a7d08af1ba1628933a387adf5c1555
Christian Brabandt <cb@256bit.org>
parents:
9786
diff
changeset
|
56 else ( move /y test.out $*.out > nul ) |
49 | 57 |
7395
377253525da5
commit https://github.com/vim/vim/commit/604619784c7f9007a883c123231d080598bd49f5
Christian Brabandt <cb@256bit.org>
parents:
7378
diff
changeset
|
58 # 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
|
59 # 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
|
60 # 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
|
61 $(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
|
62 |
4934
81e623ff2e55
updated for version 7.3.1212
Bram Moolenaar <bram@vim.org>
parents:
4817
diff
changeset
|
63 report: |
18404
b1a10a018f83
patch 8.1.2196: MS-Windows: running tests with MSVC lacks updates
Bram Moolenaar <Bram@vim.org>
parents:
18066
diff
changeset
|
64 @rem without the +eval feature test_result.log is a copy of test.log |
b1a10a018f83
patch 8.1.2196: MS-Windows: running tests with MSVC lacks updates
Bram Moolenaar <Bram@vim.org>
parents:
18066
diff
changeset
|
65 @if exist test.log ( copy /y test.log test_result.log > nul ) \ |
b1a10a018f83
patch 8.1.2196: MS-Windows: running tests with MSVC lacks updates
Bram Moolenaar <Bram@vim.org>
parents:
18066
diff
changeset
|
66 else ( echo No failures reported > test_result.log ) |
b1a10a018f83
patch 8.1.2196: MS-Windows: running tests with MSVC lacks updates
Bram Moolenaar <Bram@vim.org>
parents:
18066
diff
changeset
|
67 $(VIMPROG) -u NONE $(NO_INITS) -S summarize.vim messages |
b1a10a018f83
patch 8.1.2196: MS-Windows: running tests with MSVC lacks updates
Bram Moolenaar <Bram@vim.org>
parents:
18066
diff
changeset
|
68 @echo. |
4934
81e623ff2e55
updated for version 7.3.1212
Bram Moolenaar <bram@vim.org>
parents:
4817
diff
changeset
|
69 @echo Test results: |
18530
41b2506c7662
patch 8.1.2259: running tests may leave XfakeHOME behind
Bram Moolenaar <Bram@vim.org>
parents:
18404
diff
changeset
|
70 @cmd /c type test_result.log |
18404
b1a10a018f83
patch 8.1.2196: MS-Windows: running tests with MSVC lacks updates
Bram Moolenaar <Bram@vim.org>
parents:
18066
diff
changeset
|
71 @if exist test.log ( echo TEST FAILURE & exit /b 1 ) \ |
6643 | 72 else ( echo ALL DONE ) |
4934
81e623ff2e55
updated for version 7.3.1212
Bram Moolenaar <bram@vim.org>
parents:
4817
diff
changeset
|
73 |
7 | 74 clean: |
75 -del *.out | |
4946
d10ede931224
updated for version 7.3.1218
Bram Moolenaar <bram@vim.org>
parents:
4934
diff
changeset
|
76 -del *.failed |
7378
a6c23c3c5880
commit https://github.com/vim/vim/commit/4e5a31c8b3e259605f4d8543aaae68578cf9b0d7
Christian Brabandt <cb@256bit.org>
parents:
7366
diff
changeset
|
77 -del *.res |
6643 | 78 -if exist $(DOSTMP) rd /s /q $(DOSTMP) |
79 -if exist test.in del test.in | |
1358 | 80 -if exist test.ok del test.ok |
81 -if exist small.vim del small.vim | |
82 -if exist tiny.vim del tiny.vim | |
83 -if exist mbyte.vim del mbyte.vim | |
2101
8ae4de2d02af
updated for version 7.2.384
Bram Moolenaar <bram@zimbu.org>
parents:
2050
diff
changeset
|
84 -if exist mzscheme.vim del mzscheme.vim |
4946
d10ede931224
updated for version 7.3.1218
Bram Moolenaar <bram@vim.org>
parents:
4934
diff
changeset
|
85 -if exist Xdir1 rd /s /q Xdir1 |
d10ede931224
updated for version 7.3.1218
Bram Moolenaar <bram@vim.org>
parents:
4934
diff
changeset
|
86 -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
|
87 -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
|
88 -del X* |
7631
ad3e9ea845e7
commit https://github.com/vim/vim/commit/d0232917ced39ff4838665fbcf379d5116a91aa3
Christian Brabandt <cb@256bit.org>
parents:
7623
diff
changeset
|
89 -for /d %i in (X*) do @rmdir /s/q %i |
1358 | 90 -if exist viminfo del viminfo |
6643 | 91 -if exist test.log del test.log |
18404
b1a10a018f83
patch 8.1.2196: MS-Windows: running tests with MSVC lacks updates
Bram Moolenaar <Bram@vim.org>
parents:
18066
diff
changeset
|
92 -if exist test_result.log del test_result.log |
7378
a6c23c3c5880
commit https://github.com/vim/vim/commit/4e5a31c8b3e259605f4d8543aaae68578cf9b0d7
Christian Brabandt <cb@256bit.org>
parents:
7366
diff
changeset
|
93 -if exist messages del messages |
6330 | 94 -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
|
95 -if exist opt_test.vim del opt_test.vim |
7 | 96 |
4934
81e623ff2e55
updated for version 7.3.1212
Bram Moolenaar <bram@vim.org>
parents:
4817
diff
changeset
|
97 nolog: |
6643 | 98 -if exist test.log del test.log |
18404
b1a10a018f83
patch 8.1.2196: MS-Windows: running tests with MSVC lacks updates
Bram Moolenaar <Bram@vim.org>
parents:
18066
diff
changeset
|
99 -if exist test_result.log del test_result.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 | 101 |
20120
16460964c304
patch 8.2.0615: regexp benchmark stest is old style
Bram Moolenaar <Bram@vim.org>
parents:
18530
diff
changeset
|
102 benchmark: test_bench_regexp.res |
6328 | 103 |
20120
16460964c304
patch 8.2.0615: regexp benchmark stest is old style
Bram Moolenaar <Bram@vim.org>
parents:
18530
diff
changeset
|
104 test_bench_regexp.res: test_bench_regexp.vim |
6328 | 105 -if exist benchmark.out del benchmark.out |
20120
16460964c304
patch 8.2.0615: regexp benchmark stest is old style
Bram Moolenaar <Bram@vim.org>
parents:
18530
diff
changeset
|
106 @echo $(VIMPROG) > vimcmd |
16460964c304
patch 8.2.0615: regexp benchmark stest is old style
Bram Moolenaar <Bram@vim.org>
parents:
18530
diff
changeset
|
107 $(VIMPROG) -u NONE $(NO_INITS) -S runtest.vim $*.vim |
16460964c304
patch 8.2.0615: regexp benchmark stest is old style
Bram Moolenaar <Bram@vim.org>
parents:
18530
diff
changeset
|
108 @del vimcmd |
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 |
18066
8e10cabcde8a
patch 8.1.2028: options test script does not work
Bram Moolenaar <Bram@vim.org>
parents:
15432
diff
changeset
|
137 opt_test.vim: ../optiondefs.h gen_opt_test.vim |
8e10cabcde8a
patch 8.1.2028: options test script does not work
Bram Moolenaar <Bram@vim.org>
parents:
15432
diff
changeset
|
138 $(VIMPROG) -u NONE -S gen_opt_test.vim --noplugin --not-a-term ../optiondefs.h |