Skip to content

Commit 292eff0

Browse files
committed
patch 8.0.0708: some tests are old style
Problem: Some tests are old style. Solution: Change a few tests from old style to new style. (pschuh, closes #1813)
1 parent f1d1347 commit 292eff0

30 files changed

+343
-385
lines changed

src/Makefile

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2092,25 +2092,23 @@ test1 \
20922092
test_autoformat_join \
20932093
test_changelist \
20942094
test_close_count \
2095-
test_comparators \
20962095
test_erasebackword \
20972096
test_eval \
20982097
test_fixeol \
2099-
test_getcwd \
21002098
test_insertcount \
21012099
test_listchars \
21022100
test_search_mbyte \
21032101
test_wordcount \
21042102
test3 test4 test5 test6 test7 test8 test9 \
21052103
test11 test12 test14 test15 test17 test18 test19 \
2106-
test20 test21 test22 test23 test24 test25 test26 test27 test28 test29 \
2104+
test20 test21 test22 test25 test27 test28 test29 \
21072105
test30 test31 test32 test33 test34 test36 test37 test38 test39 \
21082106
test40 test41 test42 test43 test44 test45 test48 test49 \
21092107
test50 test51 test52 test53 test54 test55 test56 test57 test59 \
2110-
test60 test64 test66 test67 test68 test69 \
2111-
test70 test72 test73 test74 test75 test77 test78 test79 \
2108+
test60 test64 test66 test68 test69 \
2109+
test70 test72 test73 test74 test77 test78 test79 \
21122110
test80 test83 test84 test85 test86 test87 test88 \
2113-
test91 test94 test95 test97 test98 test99 \
2111+
test91 test94 test95 test98 test99 \
21142112
test100 test101 test103 test104 test107 test108:
21152113
cd testdir; rm -f [email protected]; $(MAKE) -f Makefile [email protected] VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE)
21162114

@@ -2134,6 +2132,7 @@ test_arglist \
21342132
test_clientserver \
21352133
test_cmdline \
21362134
test_command_count \
2135+
test_comparators \
21372136
test_crypt \
21382137
test_cscope \
21392138
test_cursor_func \
@@ -2142,9 +2141,12 @@ test_arglist \
21422141
test_digraph \
21432142
test_display \
21442143
test_edit \
2144+
test_escaped_glob \
21452145
test_ex_undo \
21462146
test_ex_z \
2147+
test_exec_while_if \
21472148
test_execute_func \
2149+
test_exists_autocmd \
21482150
test_expand \
21492151
test_expand_dllpath \
21502152
test_expr \
@@ -2163,6 +2165,7 @@ test_arglist \
21632165
test_fold \
21642166
test_functions \
21652167
test_ga \
2168+
test_getcwd \
21662169
test_gf \
21672170
test_glob2regpat \
21682171
test_global \
@@ -2191,6 +2194,7 @@ test_arglist \
21912194
test_lua \
21922195
test_makeencoding \
21932196
test_man \
2197+
test_maparg \
21942198
test_mapping \
21952199
test_marks \
21962200
test_match \
@@ -2209,6 +2213,7 @@ test_arglist \
22092213
test_partial \
22102214
test_paste \
22112215
test_perl \
2216+
test_plus_arg_edit \
22122217
test_popup \
22132218
test_profile \
22142219
test_put \
@@ -2219,6 +2224,7 @@ test_arglist \
22192224
test_quickfix \
22202225
test_quotestar \
22212226
test_recover \
2227+
test_regex_char_classes \
22222228
test_regexp_latin \
22232229
test_regexp_utf8 \
22242230
test_reltime \

src/testdir/Make_all.mak

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ SCRIPTS_ALL = \
2424
test19.out \
2525
test20.out \
2626
test22.out \
27-
test23.out \
28-
test24.out \
29-
test26.out \
3027
test28.out \
3128
test29.out \
3229
test31.out \
@@ -51,12 +48,10 @@ SCRIPTS_ALL = \
5148
test60.out \
5249
test64.out \
5350
test66.out \
54-
test67.out \
5551
test68.out \
5652
test69.out \
5753
test70.out \
5854
test73.out \
59-
test75.out \
6055
test77.out \
6156
test79.out \
6257
test80.out \
@@ -75,11 +70,9 @@ SCRIPTS_ALL = \
7570
test_autoformat_join.out \
7671
test_changelist.out \
7772
test_close_count.out \
78-
test_comparators.out \
7973
test_erasebackword.out \
8074
test_eval.out \
8175
test_fixeol.out \
82-
test_getcwd.out \
8376
test_insertcount.out \
8477
test_listchars.out \
8578
test_search_mbyte.out \
@@ -99,8 +92,7 @@ SCRIPTS_MORE1 = \
9992
SCRIPTS_MORE2 = \
10093
test12.out \
10194
test25.out \
102-
test49.out \
103-
test97.out
95+
test49.out
10496

10597

10698
# Tests that run on most systems, but not MingW and Cygwin.

src/testdir/Make_ming.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ 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 \
7171
dotest.in test60.ok test_listchars.ok \
72-
test_getcwd.ok test_wordcount.ok
72+
test_wordcount.ok
7373

7474
clean:
7575
-@if exist *.out $(DEL) *.out

src/testdir/Make_vms.mms

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,16 +80,15 @@ SCRIPT = test1.out test3.out test4.out test5.out \
8080
test7.out test8.out test9.out \
8181
test14.out test15.out \
8282
test19.out test20.out test22.out \
83-
test23.out test24.out test26.out \
8483
test28.out test29.out test30.out test31.out test32.out \
8584
test33.out test34.out test36.out test37.out \
8685
test38.out test39.out test40.out test41.out test42.out \
8786
test43.out test44.out test45.out \
8887
test48.out test49.out test51.out test53.out test54.out \
8988
test55.out test56.out test57.out test60.out \
9089
test64.out \
91-
test66.out test67.out test68.out test69.out \
92-
test72.out test75.out \
90+
test66.out test68.out test69.out \
91+
test72.out \
9392
test77a.out test78.out test79.out test80.out \
9493
test84.out test88.out \
9594
test91.out test94.out \
@@ -101,11 +100,9 @@ SCRIPT = test1.out test3.out test4.out test5.out \
101100
test_breakindent.out \
102101
test_changelist.out \
103102
test_close_count.out \
104-
test_comparators.out \
105103
test_erasebackword.out \
106104
test_eval.out \
107105
test_fixeol.out \
108-
test_getcwd.out \
109106
test_insertcount.out \
110107
test_listchars.out \
111108
test_listlbr.out \
@@ -131,7 +128,7 @@ SCRIPT = test1.out test3.out test4.out test5.out \
131128
# test83: ?
132129
# test85: no Lua interface
133130
# test89: bug - findfile() does not work on VMS (just in the current directory)
134-
# test97, test102: Just ODS-5 supports space and special chars in the filename.
131+
# test102: Just ODS-5 supports space and special chars in the filename.
135132
# On ODS-2 tests fail.
136133

137134
.IFDEF WANT_GUI
@@ -156,7 +153,7 @@ SCRIPT_MZSCH = test70.out
156153
.ENDIF
157154

158155
.IFDEF HAVE_ODS5
159-
SCRIPT_ODS5 = test97.out test102.out
156+
SCRIPT_ODS5 = test102.out
160157
.ENDIF
161158

162159
.IFDEF HAVE_GZIP

src/testdir/main.aap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Scripts = test1.out test2.out test3.out test4.out test5.out test6.out
88
test7.out test8.out test9.out test11.out
99
test12.out test13.out test14.out test15.out test17.out
1010
test18.out test19.out test20.out test21.out test22.out
11-
test23.out test24.out test25.out test26.out test27.out
11+
test25.out test27.out
1212
test28.out test29.out test30.out test31.out test32.out
1313
test33.out test34.out test36.out test37.out
1414
test38.out test39.out test40.out test41.out test42.out

src/testdir/test23.in

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

src/testdir/test23.ok

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

src/testdir/test24.in

-1.27 KB
Binary file not shown.

src/testdir/test24.ok

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

src/testdir/test26.in

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

0 commit comments

Comments
 (0)