Skip to content

Commit 4a6fcf8

Browse files
committed
patch 8.0.1186: still quite a few old style tests
Problem: Still quite a few old style tests. Solution: Convert old to new style tests. (Yegappan Lakshmanan) Avoid ringing the bell while running tests.
1 parent 9202162 commit 4a6fcf8

24 files changed

Lines changed: 643 additions & 1217 deletions

src/Makefile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2100,14 +2100,14 @@ test1 \
21002100
test_listchars \
21012101
test_search_mbyte \
21022102
test_wordcount \
2103-
test3 test4 test5 test7 test8 \
2103+
test3 test8 \
21042104
test11 test12 test14 test15 test17 test19 \
21052105
test20 test25 test28 test29 \
2106-
test30 test31 test32 test34 test36 test37 test38 test39 \
2106+
test30 test32 test34 test36 test37 test38 test39 \
21072107
test40 test42 test44 test45 test48 test49 \
21082108
test50 test52 test54 test55 test59 \
2109-
test60 test64 test66 test68 test69 \
2110-
test70 test72 test73 test77 test78 test79 \
2109+
test64 test66 test68 test69 \
2110+
test70 test72 test73 test77 test79 \
21112111
test83 test85 test86 test87 test88 \
21122112
test94 test95 test99 \
21132113
test108:
@@ -2149,6 +2149,7 @@ test_arglist \
21492149
test_ex_z \
21502150
test_exec_while_if \
21512151
test_execute_func \
2152+
test_exists \
21522153
test_exists_autocmd \
21532154
test_expand \
21542155
test_expand_dllpath \
@@ -2279,6 +2280,7 @@ test_arglist \
22792280
test_virtualedit \
22802281
test_visual \
22812282
test_winbar \
2283+
test_winbuf_close \
22822284
test_window_cmd \
22832285
test_window_id \
22842286
test_windows_home \

src/testdir/Make_all.mak

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,13 @@ SCRIPTS_FIRST = \
1414
# Tests that run on all systems.
1515
SCRIPTS_ALL = \
1616
test3.out \
17-
test4.out \
18-
test5.out \
19-
test7.out \
2017
test8.out \
2118
test14.out \
2219
test15.out \
2320
test19.out \
2421
test20.out \
2522
test28.out \
2623
test29.out \
27-
test31.out \
2824
test34.out \
2925
test36.out \
3026
test37.out \
@@ -36,7 +32,6 @@ SCRIPTS_ALL = \
3632
test45.out \
3733
test48.out \
3834
test55.out \
39-
test60.out \
4035
test64.out \
4136
test66.out \
4237
test68.out \
@@ -89,7 +84,6 @@ SCRIPTS_MORE4 = \
8984
test32.out \
9085
test59.out \
9186
test72.out \
92-
test78.out \
9387
test83.out
9488

9589

@@ -125,6 +119,7 @@ NEW_TESTS = test_arabic.res \
125119
test_digraph.res \
126120
test_display.res \
127121
test_edit.res \
122+
test_exists.res \
128123
test_farsi.res \
129124
test_file_size.res \
130125
test_fnameescape.res \
@@ -196,6 +191,7 @@ NEW_TESTS = test_arabic.res \
196191
test_vimscript.res \
197192
test_visual.res \
198193
test_winbar.res \
194+
test_winbuf_close.res \
199195
test_window_id.res \
200196
test_windows_home.res \
201197
test_writefile.res \
@@ -207,6 +203,4 @@ NEW_TESTS = test_arabic.res \
207203
# Explicit dependencies.
208204
test49.out: test49.vim
209205

210-
test60.out: test60.vim
211-
212206
test_options.res test_alot.res: opt_test.vim

src/testdir/Make_ming.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ win32: fixff nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_WIN32) newtests
6868
fixff:
6969
-$(VIMPROG) -u dos.vim $(NO_INITS) "+argdo set ff=dos|upd" +q *.in *.ok
7070
-$(VIMPROG) -u dos.vim $(NO_INITS) "+argdo set ff=unix|upd" +q \
71-
dotest.in test60.ok test_listchars.ok \
71+
dotest.in test_listchars.ok \
7272
test_wordcount.ok
7373

7474
clean:

src/testdir/Make_vms.mms

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,20 +73,20 @@ VIMPROG = <->vim.exe
7373

7474
.SUFFIXES : .out .in
7575

76-
SCRIPT = test1.out test3.out test4.out test5.out \
77-
test7.out test8.out \
76+
SCRIPT = test1.out test3.out \
77+
test8.out \
7878
test14.out test15.out \
7979
test19.out test20.out \
80-
test28.out test29.out test30.out test31.out test32.out \
80+
test28.out test29.out test30.out test32.out \
8181
test34.out test36.out test37.out \
8282
test38.out test39.out test40.out test42.out \
8383
test44.out test45.out \
8484
test48.out test49.out test54.out \
85-
test55.out test60.out \
85+
test55.out \
8686
test64.out \
8787
test66.out test68.out test69.out \
8888
test72.out \
89-
test77a.out test78.out test79.out \
89+
test77a.out test79.out \
9090
test88.out \
9191
test94.out \
9292
test95.out test99.out \

src/testdir/main.aap

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
VimProg ?= ../vim
66

7-
Scripts = test1.out test2.out test3.out test4.out test5.out test6.out
8-
test7.out test8.out test11.out
7+
Scripts = test1.out test2.out test3.out test6.out
8+
test8.out test11.out
99
test12.out test13.out test14.out test15.out test17.out
1010
test18.out test19.out test20.out test21.out
1111
test25.out test27.out
12-
test28.out test29.out test30.out test31.out test32.out
12+
test28.out test29.out test30.out test32.out
1313
test34.out test36.out test37.out
1414
test38.out test39.out test40.out test42.out
1515
test44.out test45.out test46.out test47.out

src/testdir/runtest.vim

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,9 @@ endif
250250

251251
" Execute the tests in alphabetical order.
252252
for s:test in sort(s:tests)
253+
" Silence, please!
254+
set belloff=all
255+
253256
call RunTheTest(s:test)
254257

255258
if len(v:errors) > 0 && index(s:flaky, s:test) >= 0

src/testdir/test31.in

Lines changed: 0 additions & 95 deletions
This file was deleted.

src/testdir/test31.ok

Lines changed: 0 additions & 14 deletions
This file was deleted.

src/testdir/test4.in

Lines changed: 0 additions & 34 deletions
This file was deleted.

src/testdir/test4.ok

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)