Skip to content

Commit

Permalink
patch 8.0.0708: some tests are old style
Browse files Browse the repository at this point in the history
Problem:    Some tests are old style.
Solution:   Change a few tests from old style to new style. (pschuh,
            closes #1813)
  • Loading branch information
brammool committed Jul 11, 2017
1 parent f1d1347 commit 292eff0
Show file tree
Hide file tree
Showing 30 changed files with 343 additions and 385 deletions.
18 changes: 12 additions & 6 deletions src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2092,25 +2092,23 @@ test1 \
test_autoformat_join \
test_changelist \
test_close_count \
test_comparators \
test_erasebackword \
test_eval \
test_fixeol \
test_getcwd \
test_insertcount \
test_listchars \
test_search_mbyte \
test_wordcount \
test3 test4 test5 test6 test7 test8 test9 \
test11 test12 test14 test15 test17 test18 test19 \
test20 test21 test22 test23 test24 test25 test26 test27 test28 test29 \
test20 test21 test22 test25 test27 test28 test29 \
test30 test31 test32 test33 test34 test36 test37 test38 test39 \
test40 test41 test42 test43 test44 test45 test48 test49 \
test50 test51 test52 test53 test54 test55 test56 test57 test59 \
test60 test64 test66 test67 test68 test69 \
test70 test72 test73 test74 test75 test77 test78 test79 \
test60 test64 test66 test68 test69 \
test70 test72 test73 test74 test77 test78 test79 \
test80 test83 test84 test85 test86 test87 test88 \
test91 test94 test95 test97 test98 test99 \
test91 test94 test95 test98 test99 \
test100 test101 test103 test104 test107 test108:
cd testdir; rm -f $@.out; $(MAKE) -f Makefile $@.out VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE)

Expand All @@ -2134,6 +2132,7 @@ test_arglist \
test_clientserver \
test_cmdline \
test_command_count \
test_comparators \
test_crypt \
test_cscope \
test_cursor_func \
Expand All @@ -2142,9 +2141,12 @@ test_arglist \
test_digraph \
test_display \
test_edit \
test_escaped_glob \
test_ex_undo \
test_ex_z \
test_exec_while_if \
test_execute_func \
test_exists_autocmd \
test_expand \
test_expand_dllpath \
test_expr \
Expand All @@ -2163,6 +2165,7 @@ test_arglist \
test_fold \
test_functions \
test_ga \
test_getcwd \
test_gf \
test_glob2regpat \
test_global \
Expand Down Expand Up @@ -2191,6 +2194,7 @@ test_arglist \
test_lua \
test_makeencoding \
test_man \
test_maparg \
test_mapping \
test_marks \
test_match \
Expand All @@ -2209,6 +2213,7 @@ test_arglist \
test_partial \
test_paste \
test_perl \
test_plus_arg_edit \
test_popup \
test_profile \
test_put \
Expand All @@ -2219,6 +2224,7 @@ test_arglist \
test_quickfix \
test_quotestar \
test_recover \
test_regex_char_classes \
test_regexp_latin \
test_regexp_utf8 \
test_reltime \
Expand Down
10 changes: 1 addition & 9 deletions src/testdir/Make_all.mak
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ SCRIPTS_ALL = \
test19.out \
test20.out \
test22.out \
test23.out \
test24.out \
test26.out \
test28.out \
test29.out \
test31.out \
Expand All @@ -51,12 +48,10 @@ SCRIPTS_ALL = \
test60.out \
test64.out \
test66.out \
test67.out \
test68.out \
test69.out \
test70.out \
test73.out \
test75.out \
test77.out \
test79.out \
test80.out \
Expand All @@ -75,11 +70,9 @@ SCRIPTS_ALL = \
test_autoformat_join.out \
test_changelist.out \
test_close_count.out \
test_comparators.out \
test_erasebackword.out \
test_eval.out \
test_fixeol.out \
test_getcwd.out \
test_insertcount.out \
test_listchars.out \
test_search_mbyte.out \
Expand All @@ -99,8 +92,7 @@ SCRIPTS_MORE1 = \
SCRIPTS_MORE2 = \
test12.out \
test25.out \
test49.out \
test97.out
test49.out


# Tests that run on most systems, but not MingW and Cygwin.
Expand Down
2 changes: 1 addition & 1 deletion src/testdir/Make_ming.mak
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ fixff:
-$(VIMPROG) -u dos.vim $(NO_INITS) "+argdo set ff=dos|upd" +q *.in *.ok
-$(VIMPROG) -u dos.vim $(NO_INITS) "+argdo set ff=unix|upd" +q \
dotest.in test60.ok test_listchars.ok \
test_getcwd.ok test_wordcount.ok
test_wordcount.ok

clean:
-@if exist *.out $(DEL) *.out
Expand Down
11 changes: 4 additions & 7 deletions src/testdir/Make_vms.mms
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,15 @@ SCRIPT = test1.out test3.out test4.out test5.out \
test7.out test8.out test9.out \
test14.out test15.out \
test19.out test20.out test22.out \
test23.out test24.out test26.out \
test28.out test29.out test30.out test31.out test32.out \
test33.out test34.out test36.out test37.out \
test38.out test39.out test40.out test41.out test42.out \
test43.out test44.out test45.out \
test48.out test49.out test51.out test53.out test54.out \
test55.out test56.out test57.out test60.out \
test64.out \
test66.out test67.out test68.out test69.out \
test72.out test75.out \
test66.out test68.out test69.out \
test72.out \
test77a.out test78.out test79.out test80.out \
test84.out test88.out \
test91.out test94.out \
Expand All @@ -101,11 +100,9 @@ SCRIPT = test1.out test3.out test4.out test5.out \
test_breakindent.out \
test_changelist.out \
test_close_count.out \
test_comparators.out \
test_erasebackword.out \
test_eval.out \
test_fixeol.out \
test_getcwd.out \
test_insertcount.out \
test_listchars.out \
test_listlbr.out \
Expand All @@ -131,7 +128,7 @@ SCRIPT = test1.out test3.out test4.out test5.out \
# test83: ?
# test85: no Lua interface
# test89: bug - findfile() does not work on VMS (just in the current directory)
# test97, test102: Just ODS-5 supports space and special chars in the filename.
# test102: Just ODS-5 supports space and special chars in the filename.
# On ODS-2 tests fail.

.IFDEF WANT_GUI
Expand All @@ -156,7 +153,7 @@ SCRIPT_MZSCH = test70.out
.ENDIF

.IFDEF HAVE_ODS5
SCRIPT_ODS5 = test97.out test102.out
SCRIPT_ODS5 = test102.out
.ENDIF

.IFDEF HAVE_GZIP
Expand Down
2 changes: 1 addition & 1 deletion src/testdir/main.aap
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Scripts = test1.out test2.out test3.out test4.out test5.out test6.out
test7.out test8.out test9.out test11.out
test12.out test13.out test14.out test15.out test17.out
test18.out test19.out test20.out test21.out test22.out
test23.out test24.out test25.out test26.out test27.out
test25.out test27.out
test28.out test29.out test30.out test31.out test32.out
test33.out test34.out test36.out test37.out
test38.out test39.out test40.out test41.out test42.out
Expand Down
15 changes: 0 additions & 15 deletions src/testdir/test23.in

This file was deleted.

2 changes: 0 additions & 2 deletions src/testdir/test23.ok

This file was deleted.

Binary file removed src/testdir/test24.in
Binary file not shown.
32 changes: 0 additions & 32 deletions src/testdir/test24.ok

This file was deleted.

44 changes: 0 additions & 44 deletions src/testdir/test26.in

This file was deleted.

10 changes: 0 additions & 10 deletions src/testdir/test26.ok

This file was deleted.

33 changes: 0 additions & 33 deletions src/testdir/test67.in

This file was deleted.

10 changes: 0 additions & 10 deletions src/testdir/test67.ok

This file was deleted.

41 changes: 0 additions & 41 deletions src/testdir/test75.in

This file was deleted.

7 changes: 0 additions & 7 deletions src/testdir/test75.ok

This file was deleted.

Loading

0 comments on commit 292eff0

Please sign in to comment.