annotate src/testdir/Make_dos.mak @ 6841:0f1cc87630d8 v7.4.741

patch 7.4.741 Problem: When using += with ":set" a trailing comma is not recognized. (Issue 365) Solution: Don't add a second comma. Add a test. (partly by Christian Brabandt)
author Bram Moolenaar <bram@vim.org>
date Fri, 19 Jun 2015 14:06:43 +0200
parents a8962f0e0d34
children 18ec2c5a5ce7
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
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8 # Omitted:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9 # test2 "\\tmp" doesn't work.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
10 # test10 'errorformat' is different
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
11 # test12 can't unlink a swap file
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
12 # test25 uses symbolic link
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
13 # test27 can't edit file with "*" in file name
5116
6cabac58f26f updated for version 7.3.1301
Bram Moolenaar <bram@vim.org>
parents: 5104
diff changeset
14 # test97 \{ and \$ are not escaped characters.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
15
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
16 SCRIPTS16 = test1.out test19.out test20.out test22.out \
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
17 test23.out test24.out test28.out test29.out \
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
18 test35.out test36.out test43.out \
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
19 test44.out test45.out test46.out test47.out \
270
a20218704019 updated for version 7.0072
vimboss
parents: 119
diff changeset
20 test48.out test51.out test53.out test54.out \
618
cd967cc647dd updated for version 7.0176
vimboss
parents: 615
diff changeset
21 test55.out test56.out test57.out test58.out test59.out \
1358
9656552c468d updated for version 7.1-072
vimboss
parents: 1327
diff changeset
22 test60.out test61.out test62.out test63.out test64.out
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
23
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
24 SCRIPTS = test3.out test4.out test5.out test6.out test7.out \
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
25 test8.out test9.out test11.out test13.out test14.out \
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
26 test15.out test17.out test18.out test21.out test26.out \
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
27 test30.out test31.out test32.out test33.out test34.out \
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
28 test37.out test38.out test39.out test40.out test41.out \
2005
20c18291deb2 updated for version 7.2-302
vimboss
parents: 1963
diff changeset
29 test42.out test52.out test65.out test66.out test67.out \
2607
2f57d93bdbf6 updated for version 7.3.030
Bram Moolenaar <bram@vim.org>
parents: 2558
diff changeset
30 test68.out test69.out test71.out test72.out test73.out \
2904
c249d9aa60f7 updated for version 7.3.225
Bram Moolenaar <bram@vim.org>
parents: 2885
diff changeset
31 test74.out test75.out test76.out test77.out test78.out \
3443
21219ffc9790 updated for version 7.3.487
Bram Moolenaar <bram@vim.org>
parents: 3131
diff changeset
32 test79.out test80.out test81.out test82.out test83.out \
4113
8904ccd5ee85 updated for version 7.3.810
Bram Moolenaar <bram@vim.org>
parents: 3986
diff changeset
33 test84.out test85.out test86.out test87.out test88.out \
4274
015e53d99787 updated for version 7.3.887
Bram Moolenaar <bram@vim.org>
parents: 4172
diff changeset
34 test89.out test90.out test91.out test92.out test93.out \
5450
829aa8c8449d updated for version 7.4.075
Bram Moolenaar <bram@vim.org>
parents: 5351
diff changeset
35 test94.out test95.out test96.out test98.out test99.out \
5690
40f18a1c1592 updated for version 7.4.191
Bram Moolenaar <bram@vim.org>
parents: 5641
diff changeset
36 test100.out test101.out test102.out test103.out test104.out \
5948
646616b6ff4d updated for version 7.4.315
Bram Moolenaar <bram@vim.org>
parents: 5848
diff changeset
37 test105.out test106.out test107.out\
6522
a03e143b9358 updated for version 7.4.588
Bram Moolenaar <bram@vim.org>
parents: 6438
diff changeset
38 test_argument_0count.out \
6398
5a76e36f07b1 updated for version 7.4.530
Bram Moolenaar <bram@vim.org>
parents: 6330
diff changeset
39 test_argument_count.out \
5848
75f222d67cea updated for version 7.4.267
Bram Moolenaar <bram@vim.org>
parents: 5796
diff changeset
40 test_autoformat_join.out \
5995
ef83b423ebf7 updated for version 7.4.338
Bram Moolenaar <bram@vim.org>
parents: 5948
diff changeset
41 test_breakindent.out \
6096
09af7cb358f0 updated for version 7.4.386
Bram Moolenaar <bram@vim.org>
parents: 6079
diff changeset
42 test_changelist.out \
6398
5a76e36f07b1 updated for version 7.4.530
Bram Moolenaar <bram@vim.org>
parents: 6330
diff changeset
43 test_close_count.out \
6424
de877dab1c31 updated for version 7.4.542
Bram Moolenaar <bram@vim.org>
parents: 6398
diff changeset
44 test_command_count.out \
6712
c939d19bd86e updated for version 7.4.680
Bram Moolenaar <bram@vim.org>
parents: 6675
diff changeset
45 test_erasebackword.out \
5796
f084024c0ddb updated for version 7.4.242
Bram Moolenaar <bram@vim.org>
parents: 5774
diff changeset
46 test_eval.out \
6098
975d96776111 updated for version 7.4.387
Bram Moolenaar <bram@vim.org>
parents: 6096
diff changeset
47 test_insertcount.out \
6777
a8962f0e0d34 patch 7.4.710
Bram Moolenaar <bram@vim.org>
parents: 6712
diff changeset
48 test_listchars.out \
6140
cb3218a69c2f updated for version 7.4.408
Bram Moolenaar <bram@vim.org>
parents: 6098
diff changeset
49 test_listlbr.out \
cb3218a69c2f updated for version 7.4.408
Bram Moolenaar <bram@vim.org>
parents: 6098
diff changeset
50 test_listlbr_utf8.out \
6299
3eb160c5b3a1 updated for version 7.4.483
Bram Moolenaar <bram@vim.org>
parents: 6272
diff changeset
51 test_mapping.out \
6616
290631797b76 updated for version 7.4.634
Bram Moolenaar <bram@vim.org>
parents: 6522
diff changeset
52 test_marks.out \
6438
1fd9f1d43660 updated for version 7.4.549
Bram Moolenaar <bram@vim.org>
parents: 6424
diff changeset
53 test_nested_function.out \
6140
cb3218a69c2f updated for version 7.4.408
Bram Moolenaar <bram@vim.org>
parents: 6098
diff changeset
54 test_options.out \
cb3218a69c2f updated for version 7.4.408
Bram Moolenaar <bram@vim.org>
parents: 6098
diff changeset
55 test_qf_title.out \
6841
0f1cc87630d8 patch 7.4.741
Bram Moolenaar <bram@vim.org>
parents: 6777
diff changeset
56 test_set.out \
6307
1f9577e9ef1b updated for version 7.4.487
Bram Moolenaar <bram@vim.org>
parents: 6299
diff changeset
57 test_signs.out \
6675
24e0b6dd52e1 updated for version 7.4.662
Bram Moolenaar <bram@vim.org>
parents: 6645
diff changeset
58 test_textobjects.out \
6140
cb3218a69c2f updated for version 7.4.408
Bram Moolenaar <bram@vim.org>
parents: 6098
diff changeset
59 test_utf8.out
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
60
2050
afcf9db31561 updated for version 7.2.336
Bram Moolenaar <bram@zimbu.org>
parents: 2005
diff changeset
61 SCRIPTS32 = test50.out test70.out
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
62
6643
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
63 SCRIPTS_GUI = test16.out
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
64
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
65 TEST_OUTFILES = $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS32) $(SCRIPTS_GUI)
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
66 DOSTMP = dostmp
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
67 DOSTMP_OUTFILES = $(TEST_OUTFILES:test=dostmp\test)
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
68 DOSTMP_INFILES = $(DOSTMP_OUTFILES:.out=.in)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
69
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
70 .SUFFIXES: .in .out
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
71
6643
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
72 nongui: nolog $(SCRIPTS16) $(SCRIPTS) report
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
73
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
74 small: nolog report
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
75
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
76 gui: nolog $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS_GUI) report
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
77
6643
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
78 win32: nolog $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS32) report
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
79
6643
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
80 # 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
81 $(DOSTMP_INFILES): $(*B).in
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
82 if not exist $(DOSTMP)\NUL md $(DOSTMP)
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
83 if exist $@ del $@
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
84 $(VIMPROG) -u dos.vim --noplugin "+set ff=dos|f $@|wq" $(*B).in
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
85
6643
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
86 # 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
87 # 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
88 $(TEST_OUTFILES): $(DOSTMP)\$(*B).in
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
89 -@if exist test.out DEL test.out
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
90 move $(*B).in $(*B).in.bak
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
91 copy $(DOSTMP)\$(*B).in $(*B).in
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
92 copy $(*B).ok test.ok
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
93 $(VIMPROG) -u dos.vim -U NONE --noplugin -s dotest.in $(*B).in
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
94 -@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
95 -@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
96 -@del X*
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
97 -@if exist test.ok del test.ok
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
98 -@if exist Xdir1 rd /s /q Xdir1
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
99 -@if exist Xfind rd /s /q Xfind
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
100 -@if exist viminfo del viminfo
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
101 $(VIMPROG) -u dos.vim --noplugin "+set ff=unix|f test.out|wq" \
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
102 $(DOSTMP)\$(*B).out
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
103 @diff test.out $*.ok & if errorlevel 1 \
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
104 ( move /y test.out $*.failed \
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
105 & del $(DOSTMP)\$(*B).out \
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
106 & echo $* FAILED >> test.log ) \
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
107 else ( move /y test.out $*.out )
49
10286edc333c updated for version 7.0028
vimboss
parents: 40
diff changeset
108
4934
81e623ff2e55 updated for version 7.3.1212
Bram Moolenaar <bram@vim.org>
parents: 4817
diff changeset
109 report:
81e623ff2e55 updated for version 7.3.1212
Bram Moolenaar <bram@vim.org>
parents: 4817
diff changeset
110 @echo ""
81e623ff2e55 updated for version 7.3.1212
Bram Moolenaar <bram@vim.org>
parents: 4817
diff changeset
111 @echo Test results:
6643
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
112 @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
113 else ( echo ALL DONE )
4934
81e623ff2e55 updated for version 7.3.1212
Bram Moolenaar <bram@vim.org>
parents: 4817
diff changeset
114
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
115 clean:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
116 -del *.out
4946
d10ede931224 updated for version 7.3.1218
Bram Moolenaar <bram@vim.org>
parents: 4934
diff changeset
117 -del *.failed
6643
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
118 -if exist $(DOSTMP) rd /s /q $(DOSTMP)
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
119 -if exist test.in del test.in
1358
9656552c468d updated for version 7.1-072
vimboss
parents: 1327
diff changeset
120 -if exist test.ok del test.ok
9656552c468d updated for version 7.1-072
vimboss
parents: 1327
diff changeset
121 -if exist small.vim del small.vim
9656552c468d updated for version 7.1-072
vimboss
parents: 1327
diff changeset
122 -if exist tiny.vim del tiny.vim
9656552c468d updated for version 7.1-072
vimboss
parents: 1327
diff changeset
123 -if exist mbyte.vim del mbyte.vim
2101
8ae4de2d02af updated for version 7.2.384
Bram Moolenaar <bram@zimbu.org>
parents: 2050
diff changeset
124 -if exist mzscheme.vim del mzscheme.vim
3855
1cc37b8cfaa1 updated for version 7.3.684
Bram Moolenaar <bram@vim.org>
parents: 3618
diff changeset
125 -if exist lua.vim del lua.vim
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
126 -del X*
4946
d10ede931224 updated for version 7.3.1218
Bram Moolenaar <bram@vim.org>
parents: 4934
diff changeset
127 -if exist Xdir1 rd /s /q Xdir1
d10ede931224 updated for version 7.3.1218
Bram Moolenaar <bram@vim.org>
parents: 4934
diff changeset
128 -if exist Xfind rd /s /q Xfind
1358
9656552c468d updated for version 7.1-072
vimboss
parents: 1327
diff changeset
129 -if exist viminfo del viminfo
6643
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
130 -if exist test.log del test.log
6330
24ee7a7a26b1 updated for version 7.4.498
Bram Moolenaar <bram@vim.org>
parents: 6328
diff changeset
131 -if exist benchmark.out del benchmark.out
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
132
4934
81e623ff2e55 updated for version 7.3.1212
Bram Moolenaar <bram@vim.org>
parents: 4817
diff changeset
133 nolog:
6643
4f9c3e62d4d4 updated for version 7.4.647
Bram Moolenaar <bram@vim.org>
parents: 6616
diff changeset
134 -if exist test.log del test.log
6328
adfbffe1e642 updated for version 7.4.497
Bram Moolenaar <bram@vim.org>
parents: 6307
diff changeset
135
adfbffe1e642 updated for version 7.4.497
Bram Moolenaar <bram@vim.org>
parents: 6307
diff changeset
136 benchmark:
adfbffe1e642 updated for version 7.4.497
Bram Moolenaar <bram@vim.org>
parents: 6307
diff changeset
137 bench_re_freeze.out
adfbffe1e642 updated for version 7.4.497
Bram Moolenaar <bram@vim.org>
parents: 6307
diff changeset
138
adfbffe1e642 updated for version 7.4.497
Bram Moolenaar <bram@vim.org>
parents: 6307
diff changeset
139 bench_re_freeze.out: bench_re_freeze.vim
adfbffe1e642 updated for version 7.4.497
Bram Moolenaar <bram@vim.org>
parents: 6307
diff changeset
140 -if exist benchmark.out del benchmark.out
adfbffe1e642 updated for version 7.4.497
Bram Moolenaar <bram@vim.org>
parents: 6307
diff changeset
141 $(VIMPROG) -u dos.vim -U NONE --noplugin $*.in
adfbffe1e642 updated for version 7.4.497
Bram Moolenaar <bram@vim.org>
parents: 6307
diff changeset
142 @IF EXIST benchmark.out ( type benchmark.out )