Skip to content

Commit 209d387

Browse files
committed
patch 8.0.1302: still too many old style tests
Problem: Still too many old style tests. Solution: Convert a few more tests to new style. (Yegappan Lakshmanan, closes #2326)
1 parent 7cb769a commit 209d387

24 files changed

Lines changed: 659 additions & 744 deletions

src/Makefile

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2097,18 +2097,14 @@ run_message_test: $(MESSAGE_TEST_TARGET)
20972097
# Run individual OLD style test.
20982098
# These do not depend on the executable, compile it when needed.
20992099
test1 \
2100-
test_close_count \
2101-
test_erasebackword \
21022100
test_eval \
2103-
test_fixeol \
2104-
test_listchars \
21052101
test_wordcount \
21062102
test3 test11 test14 test15 test17 \
21072103
test29 test30 test36 test37 test39 \
21082104
test42 test44 test48 test49 \
21092105
test50 test52 test59 \
2110-
test64 test68 test69 \
2111-
test70 test72 test73 \
2106+
test64 test69 \
2107+
test70 test72 \
21122108
test85 test86 test87 test88 \
21132109
test94 test95 test99 test108:
21142110
cd testdir; rm -f [email protected]; $(MAKE) -f Makefile [email protected] VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE)
@@ -2133,6 +2129,7 @@ test_arglist \
21332129
test_charsearch_utf8 \
21342130
test_cindent \
21352131
test_clientserver \
2132+
test_close_count \
21362133
test_cmdline \
21372134
test_command_count \
21382135
test_comparators \
@@ -2145,6 +2142,7 @@ test_arglist \
21452142
test_digraph \
21462143
test_display \
21472144
test_edit \
2145+
test_erasebackword \
21482146
test_escaped_glob \
21492147
test_ex_undo \
21502148
test_ex_z \
@@ -2164,7 +2162,9 @@ test_arglist \
21642162
test_filetype \
21652163
test_filter_cmd \
21662164
test_filter_map \
2165+
test_find_complete \
21672166
test_findfile \
2167+
test_fixeol \
21682168
test_float_func \
21692169
test_fnameescape \
21702170
test_fnamemodify \
@@ -2200,6 +2200,7 @@ test_arglist \
22002200
test_let \
22012201
test_lineending \
22022202
test_lispwords \
2203+
test_listchars \
22032204
test_listdict \
22042205
test_listlbr \
22052206
test_listlbr_utf8 \
@@ -2272,6 +2273,7 @@ test_arglist \
22722273
test_tcl \
22732274
test_terminal \
22742275
test_terminal_fail \
2276+
test_textformat \
22752277
test_textobjects \
22762278
test_timers \
22772279
test_true_false \

src/testdir/Make_all.mak

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,14 @@ SCRIPTS_ALL = \
2424
test44.out \
2525
test48.out \
2626
test64.out \
27-
test68.out \
2827
test69.out \
2928
test70.out \
30-
test73.out \
3129
test88.out \
3230
test94.out \
3331
test95.out \
3432
test99.out \
3533
test108.out \
36-
test_close_count.out \
37-
test_erasebackword.out \
3834
test_eval.out \
39-
test_fixeol.out \
40-
test_listchars.out \
4135
test_wordcount.out
4236

4337

@@ -86,6 +80,7 @@ NEW_TESTS = test_arabic.res \
8680
test_charsearch.res \
8781
test_cindent.res \
8882
test_clientserver.res \
83+
test_close_count.res \
8984
test_cmdline.res \
9085
test_command_count.res \
9186
test_crypt.res \
@@ -95,9 +90,12 @@ NEW_TESTS = test_arabic.res \
9590
test_digraph.res \
9691
test_display.res \
9792
test_edit.res \
93+
test_erasebackword.res \
9894
test_exists.res \
9995
test_farsi.res \
10096
test_file_size.res \
97+
test_find_complete.res \
98+
test_fixeol.res \
10199
test_fnameescape.res \
102100
test_fold.res \
103101
test_getvar.res \
@@ -119,6 +117,7 @@ NEW_TESTS = test_arabic.res \
119117
test_langmap.res \
120118
test_let.res \
121119
test_lineending.res \
120+
test_listchars.res \
122121
test_listdict.res \
123122
test_listlbr.res \
124123
test_listlbr_utf8.res \

src/testdir/Make_ming.mak

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@ win32: fixff nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_WIN32) newtests
6363
fixff:
6464
-$(VIMPROG) -u dos.vim $(NO_INITS) "+argdo set ff=dos|upd" +q *.in *.ok
6565
-$(VIMPROG) -u dos.vim $(NO_INITS) "+argdo set ff=unix|upd" +q \
66-
dotest.in test_listchars.ok \
67-
test_wordcount.ok
66+
dotest.in test_wordcount.ok
6867

6968
clean:
7069
-@if exist *.out $(DEL) *.out

src/testdir/Make_vms.mms

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,16 +78,12 @@ SCRIPT = test1.out test3.out \
7878
test29.out \
7979
test30.out test36.out test37.out test39.out \
8080
test42.out test44.out test48.out test49.out \
81-
test64.out test68.out test69.out \
81+
test64.out test69.out \
8282
test72.out test77a.out test88.out \
8383
test94.out test95.out test99.out test108.out \
8484
test_autocmd_option.out \
8585
test_breakindent.out \
86-
test_close_count.out \
87-
test_erasebackword.out \
8886
test_eval.out \
89-
test_fixeol.out \
90-
test_listchars.out \
9187
test_listlbr.out \
9288
test_listlbr_utf8.out \
9389
test_utf8.out \
@@ -114,7 +110,7 @@ GUI_OPTION = -g
114110
.ENDIF
115111

116112
.IFDEF WANT_UNIX
117-
SCRIPT_UNIX = test10.out test17.out test27.out test49.out test73.out
113+
SCRIPT_UNIX = test10.out test17.out test27.out test49.out
118114
.ENDIF
119115

120116
.IFDEF WANT_WIN

src/testdir/runtest.vim

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,10 @@ func RunTheTest(test)
103103
" buffers.
104104
%bwipe!
105105

106+
" The test may change the current directory. Save and restore the
107+
" directory after executing the test.
108+
let save_cwd = getcwd()
109+
106110
if exists("*SetUp")
107111
try
108112
call SetUp()
@@ -157,6 +161,8 @@ func RunTheTest(test)
157161
break
158162
endif
159163
endwhile
164+
165+
exe 'cd ' . save_cwd
160166
endfunc
161167

162168
func AfterTheTest()

src/testdir/test68.in

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

src/testdir/test68.ok

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

0 commit comments

Comments
 (0)