To: vim_dev@googlegroups.com Subject: Patch 8.0.0708 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.0708 Problem: Some tests are old style. Solution: Change a few tests from old style to new style. (pschuh, closes #1813) Files: src/Makefile, src/testdir/Make_all.mak, src/testdir/Make_ming.mak, src/testdir/Make_vms.mms, src/testdir/main.aap, src/testdir/test23.in, src/testdir/test23.ok, src/testdir/test24.in, src/testdir/test24.ok, src/testdir/test26.in, src/testdir/test26.ok, src/testdir/test67.in, src/testdir/test67.ok, src/testdir/test75.in, src/testdir/test75.ok, src/testdir/test97.in, src/testdir/test97.ok, src/testdir/test_comparators.in, src/testdir/test_comparators.ok, src/testdir/test_comparators.vim, src/testdir/test_escaped_glob.vim, src/testdir/test_exec_while_if.vim, src/testdir/test_exists_autocmd.vim, src/testdir/test_getcwd.in, src/testdir/test_getcwd.ok, src/testdir/test_getcwd.vim, src/testdir/test_maparg.vim, src/testdir/test_plus_arg_edit.vim, src/testdir/test_regex_char_classes.vim *** ../vim-8.0.0707/src/Makefile 2017-07-07 12:42:36.317480270 +0200 --- src/Makefile 2017-07-11 21:35:19.670303616 +0200 *************** *** 2092,2116 **** 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 \ 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 \ test80 test83 test84 test85 test86 test87 test88 \ ! test91 test94 test95 test97 test98 test99 \ test100 test101 test103 test104 test107 test108: cd testdir; rm -f $@.out; $(MAKE) -f Makefile $@.out VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE) --- 2092,2114 ---- test_autoformat_join \ test_changelist \ test_close_count \ test_erasebackword \ test_eval \ test_fixeol \ 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 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 test68 test69 \ ! test70 test72 test73 test74 test77 test78 test79 \ test80 test83 test84 test85 test86 test87 test88 \ ! 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) *************** *** 2134,2139 **** --- 2132,2138 ---- test_clientserver \ test_cmdline \ test_command_count \ + test_comparators \ test_crypt \ test_cscope \ test_cursor_func \ *************** *** 2142,2150 **** --- 2141,2152 ---- 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 \ *************** *** 2163,2168 **** --- 2165,2171 ---- test_fold \ test_functions \ test_ga \ + test_getcwd \ test_gf \ test_glob2regpat \ test_global \ *************** *** 2191,2196 **** --- 2194,2200 ---- test_lua \ test_makeencoding \ test_man \ + test_maparg \ test_mapping \ test_marks \ test_match \ *************** *** 2209,2214 **** --- 2213,2219 ---- test_partial \ test_paste \ test_perl \ + test_plus_arg_edit \ test_popup \ test_profile \ test_put \ *************** *** 2219,2224 **** --- 2224,2230 ---- test_quickfix \ test_quotestar \ test_recover \ + test_regex_char_classes \ test_regexp_latin \ test_regexp_utf8 \ test_reltime \ *** ../vim-8.0.0707/src/testdir/Make_all.mak 2017-06-27 18:28:52.558196805 +0200 --- src/testdir/Make_all.mak 2017-07-11 21:35:19.670303616 +0200 *************** *** 24,32 **** test19.out \ test20.out \ test22.out \ - test23.out \ - test24.out \ - test26.out \ test28.out \ test29.out \ test31.out \ --- 24,29 ---- *************** *** 51,62 **** test60.out \ test64.out \ test66.out \ - test67.out \ test68.out \ test69.out \ test70.out \ test73.out \ - test75.out \ test77.out \ test79.out \ test80.out \ --- 48,57 ---- *************** *** 75,85 **** 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 \ --- 70,78 ---- *************** *** 99,106 **** SCRIPTS_MORE2 = \ test12.out \ test25.out \ ! test49.out \ ! test97.out # Tests that run on most systems, but not MingW and Cygwin. --- 92,98 ---- SCRIPTS_MORE2 = \ test12.out \ test25.out \ ! test49.out # Tests that run on most systems, but not MingW and Cygwin. *** ../vim-8.0.0707/src/testdir/Make_ming.mak 2017-03-13 22:41:38.376723909 +0100 --- src/testdir/Make_ming.mak 2017-07-11 21:35:19.670303616 +0200 *************** *** 69,75 **** -$(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 clean: -@if exist *.out $(DEL) *.out --- 69,75 ---- -$(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_wordcount.ok clean: -@if exist *.out $(DEL) *.out *** ../vim-8.0.0707/src/testdir/Make_vms.mms 2017-06-27 18:28:52.558196805 +0200 --- src/testdir/Make_vms.mms 2017-07-11 21:35:19.670303616 +0200 *************** *** 80,86 **** 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 \ --- 80,85 ---- *************** *** 88,95 **** 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 \ test77a.out test78.out test79.out test80.out \ test84.out test88.out \ test91.out test94.out \ --- 87,94 ---- test48.out test49.out test51.out test53.out test54.out \ test55.out test56.out test57.out test60.out \ test64.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 \ *************** *** 101,111 **** 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 \ --- 100,108 ---- *************** *** 131,137 **** # 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. # On ODS-2 tests fail. .IFDEF WANT_GUI --- 128,134 ---- # test83: ? # test85: no Lua interface # test89: bug - findfile() does not work on VMS (just in the current directory) ! # test102: Just ODS-5 supports space and special chars in the filename. # On ODS-2 tests fail. .IFDEF WANT_GUI *************** *** 156,162 **** .ENDIF .IFDEF HAVE_ODS5 ! SCRIPT_ODS5 = test97.out test102.out .ENDIF .IFDEF HAVE_GZIP --- 153,159 ---- .ENDIF .IFDEF HAVE_ODS5 ! SCRIPT_ODS5 = test102.out .ENDIF .IFDEF HAVE_GZIP *** ../vim-8.0.0707/src/testdir/main.aap 2016-06-26 19:33:16.000000000 +0200 --- src/testdir/main.aap 2017-07-11 21:35:19.670303616 +0200 *************** *** 8,14 **** 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 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 --- 8,14 ---- 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 ! 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 *** ../vim-8.0.0707/src/testdir/test23.in 2010-05-15 13:04:10.000000000 +0200 --- src/testdir/test23.in 1970-01-01 01:00:00.000000000 +0100 *************** *** 1,15 **** - Tests for complicated + argument to :edit command - - STARTTEST - :$-1w! Xfile1 - :$w! Xfile2 - :edit +1|s/|/PIPE/|w Xfile1| e Xfile2|1 | s/\//SLASH/|w - :w! test.out - :e Xfile1 - :w >> test.out - :qa! - ENDTEST - - The result should be in Xfile1: "fooPIPEbar", in Xfile2: "fooSLASHbar" - foo|bar - foo/bar --- 0 ---- *** ../vim-8.0.0707/src/testdir/test23.ok 2010-05-15 13:04:10.000000000 +0200 --- src/testdir/test23.ok 1970-01-01 01:00:00.000000000 +0100 *************** *** 1,2 **** - fooSLASHbar - fooPIPEbar --- 0 ---- *** ../vim-8.0.0707/src/testdir/test24.in 2013-06-02 22:03:23.000000000 +0200 --- src/testdir/test24.in 1970-01-01 01:00:00.000000000 +0100 *************** *** 1,89 **** - Tests for regexp with backslash and other special characters inside [] - Also test backslash for hex/octal numbered character. - - STARTTEST - :set nocompatible viminfo+=nviminfo - /[\x] - x/[\t\]] - x/[]y] - x/[\]] - x/[y^] - x/[$y] - x/[\x61] - x/[\x60-\x64] - xj0/[\x785] - x/[\o143] - x/[\o140-\o144] - x/[\o417] - x/\%x42 - x/\%o103 - x/[\x00] - x - :s/[\x00-\x10]//g - - :s/[\x-z]\+// - - :s/[\u-z]\{2,}// - - :s/\(a\)\+// - - :s/\(a*\)\+// - - :s/\(a*\)*// - - :s/\(a\)\{2,3}/A/ - - :s/\(a\)\{-2,3}/A/ - - :s/\(a\)*\(12\)\@>/A/ - - :s/\(foo\)\@\|\.\)\=\)\+=/XX/ - - :s/^\(\h\w*\%(->\|\.\)\=\)\+=/YY/ - - :s/aaa/xyz/ - - :s/~/bcd/ - - :s/~\+/BB/ - :" - :?start?,$w! test.out - :qa! - ENDTEST - - start - test \text test text - test text test text - test text ]test text - test ]text test text - test text te^st text - test te$xt test text - test taext test text x61 - test tbext test text x60-x64 - test 5text test text x78 5 - testc text test text o143 - tesdt text test text o140-o144 - test7 text test text o41 7 - test text tBest text \%x42 - test text teCst text \%o103 - test text test text [\x00] - test text test text [\x00-\x10] - test \xyztext test text [\x-z] - test text tev\uyst text [\u-z] - xx aaaaa xx a - xx aaaaa xx a - xx aaaaa xx a - xx aaaaa xx - xx aaaaa xx - xx aaa12aa xx - xx foobar xbar xx - xx an file xx - x= 9; - hh= 77; - aaa - xyz - bcdbcdbcd --- 0 ---- *** ../vim-8.0.0707/src/testdir/test24.ok 2013-06-02 22:03:36.000000000 +0200 --- src/testdir/test24.ok 1970-01-01 01:00:00.000000000 +0100 *************** *** 1,32 **** - start - test text test text - test text test text - test text test text - test text test text - test text test text - test text test text - test text test text x61 - test text test text x60-x64 - test text test text x78 5 - test text test text o143 - test text test text o140-o144 - test text test text o41 7 - test text test text \%x42 - test text test text \%o103 - test text test text [\x00] - test text test text [\x00-\x10] - test text test text [\x-z] - test text test text [\u-z] - xx xx a - xx aaaaa xx a - xx aaaaa xx a - xx Aaa xx - xx Aaaa xx - xx Aaa xx - xx foobar xA xx - xx an A xx - XX 9; - YY 77; - xyz - bcd - BB --- 0 ---- *** ../vim-8.0.0707/src/testdir/test26.in 2010-05-15 13:04:10.000000000 +0200 --- src/testdir/test26.in 1970-01-01 01:00:00.000000000 +0100 *************** *** 1,44 **** - Test for :execute, :while and :if - - STARTTEST - :so small.vim - mt:let i = 0 - :while i < 12 - : let i = i + 1 - : if has("ebcdic") - : execute "normal o" . i . "\047" - : else - : execute "normal o" . i . "\033" - : endif - : if i % 2 - : normal Ax - : if i == 9 - : break - : endif - : if i == 5 - : continue - : else - : let j = 9 - : while j > 0 - : if has("ebcdic") - : execute "normal" j . "a" . j . "\x27" - : else - : execute "normal" j . "a" . j . "\x1b" - : endif - : let j = j - 1 - : endwhile - : endif - : endif - : if i == 9 - : if has("ebcdic") - : execute "normal Az\047" - : else - : execute "normal Az\033" - : endif - : endif - :endwhile - :unlet i j - :'t,$w! test.out - :qa! - ENDTEST - --- 0 ---- *** ../vim-8.0.0707/src/testdir/test26.ok 2010-05-15 13:04:10.000000000 +0200 --- src/testdir/test26.ok 1970-01-01 01:00:00.000000000 +0100 *************** *** 1,10 **** - - 1x999999999888888887777777666666555554444333221 - 2 - 3x999999999888888887777777666666555554444333221 - 4 - 5x - 6 - 7x999999999888888887777777666666555554444333221 - 8 - 9x --- 0 ---- *** ../vim-8.0.0707/src/testdir/test67.in 2016-10-12 17:52:39.199701825 +0200 --- src/testdir/test67.in 1970-01-01 01:00:00.000000000 +0100 *************** *** 1,33 **** - Test that groups and patterns are tested correctly when calling exists() for - autocommands. - - STARTTEST - :so small.vim - :let results=[] - :augroup auexists - :augroup END - :call add(results, "##BufEnter: " . exists("##BufEnter")) - :call add(results, "#BufEnter: " . exists("#BufEnter")) - :au BufEnter * let g:entered=1 - :call add(results, "#BufEnter: " . exists("#BufEnter")) - :call add(results, "#auexists#BufEnter: " . exists("#auexists#BufEnter")) - :augroup auexists - :au BufEnter * let g:entered=1 - :augroup END - :call add(results, "#auexists#BufEnter: " . exists("#auexists#BufEnter")) - :call add(results, "#BufEnter#*.test: " . exists("#BufEnter#*.test")) - :au BufEnter *.test let g:entered=1 - :call add(results, "#BufEnter#*.test: " . exists("#BufEnter#*.test")) - :edit testfile.test - :call add(results, "#BufEnter#: " . exists("#BufEnter#")) - :au BufEnter let g:entered=1 - :call add(results, "#BufEnter#: " . exists("#BufEnter#")) - :edit testfile2.test - :call add(results, "#BufEnter#: " . exists("#BufEnter#")) - :e! test.out - :call append(0, results) - :$d - :w - :qa! - ENDTEST - --- 0 ---- *** ../vim-8.0.0707/src/testdir/test67.ok 2010-05-15 13:04:10.000000000 +0200 --- src/testdir/test67.ok 1970-01-01 01:00:00.000000000 +0100 *************** *** 1,10 **** - ##BufEnter: 1 - #BufEnter: 0 - #BufEnter: 1 - #auexists#BufEnter: 0 - #auexists#BufEnter: 1 - #BufEnter#*.test: 0 - #BufEnter#*.test: 1 - #BufEnter#: 0 - #BufEnter#: 1 - #BufEnter#: 0 --- 0 ---- *** ../vim-8.0.0707/src/testdir/test75.in 2014-09-09 13:48:54.000000000 +0200 --- src/testdir/test75.in 1970-01-01 01:00:00.000000000 +0100 *************** *** 1,41 **** - Tests for maparg(). - Also test utf8 map with a 0x80 byte. - - STARTTEST - :so small.vim - :so mbyte.vim - :set cpo-=< - :set encoding=utf8 - :" Test maparg() with a string result - :map foo isfoo - :vnoremap