To: vim_dev@googlegroups.com Subject: Patch 8.1.1955 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.1955 Problem: Tests contain typos. Solution: Correct the typos. (Dominique Pelle) Files: src/testdir/popupbounce.vim, src/testdir/runtest.vim, src/testdir/screendump.vim, src/testdir/test49.vim, src/testdir/test_autocmd.vim, src/testdir/test_cindent.vim, src/testdir/test_const.vim, src/testdir/test_popupwin.vim, src/testdir/test_quickfix.vim, src/testdir/test_search.vim, src/testdir/test_tabpage.vim, src/testdir/test_tcl.vim *** ../vim-8.1.1954/src/testdir/popupbounce.vim 2019-06-10 21:23:52.363724122 +0200 --- src/testdir/popupbounce.vim 2019-09-01 14:36:29.848231705 +0200 *************** *** 6,12 **** " ./vim --clean -S testdir/popupbounce.vim main.c " gprof vim gmon.out | vim - ! " using line contination set nocp " don't switch screens when quitting, so we can read the frames/sec --- 6,12 ---- " ./vim --clean -S testdir/popupbounce.vim main.c " gprof vim gmon.out | vim - ! " using line continuation set nocp " don't switch screens when quitting, so we can read the frames/sec *** ../vim-8.1.1954/src/testdir/runtest.vim 2019-08-31 17:48:16.725154231 +0200 --- src/testdir/runtest.vim 2019-09-01 14:36:29.848231705 +0200 *************** *** 349,355 **** \ 'Test_terminal_scrollback()', \ 'Test_terminal_split_quit()', \ 'Test_terminal_termwinkey()', ! \ 'Test_terminal_termwinsize_mininmum()', \ 'Test_terminal_termwinsize_option_fixed()', \ 'Test_terminal_termwinsize_option_zero()', \ 'Test_terminal_tmap()', --- 349,355 ---- \ 'Test_terminal_scrollback()', \ 'Test_terminal_split_quit()', \ 'Test_terminal_termwinkey()', ! \ 'Test_terminal_termwinsize_minimum()', \ 'Test_terminal_termwinsize_option_fixed()', \ 'Test_terminal_termwinsize_option_zero()', \ 'Test_terminal_tmap()', *************** *** 395,401 **** " Repeat a flaky test. Give up when: " - it fails again with the same message ! " - it fails five times (with a different mesage) if len(v:errors) > 0 \ && (index(s:flaky_tests, s:test) >= 0 \ || v:errors[0] =~ s:flaky_errors_re) --- 395,401 ---- " Repeat a flaky test. Give up when: " - it fails again with the same message ! " - it fails five times (with a different message) if len(v:errors) > 0 \ && (index(s:flaky_tests, s:test) >= 0 \ || v:errors[0] =~ s:flaky_errors_re) *** ../vim-8.1.1954/src/testdir/screendump.vim 2019-06-23 00:49:50.985715087 +0200 --- src/testdir/screendump.vim 2019-09-01 14:36:29.848231705 +0200 *************** *** 24,30 **** let reference = 'dumps/' . a:filename . '.dump' let testfile = 'failed/' . a:filename . '.dump' ! " Redraw to execut the code that updates the screen. Otherwise we get the " text and attributes only from the internal buffer. redraw --- 24,30 ---- let reference = 'dumps/' . a:filename . '.dump' let testfile = 'failed/' . a:filename . '.dump' ! " Redraw to execute the code that updates the screen. Otherwise we get the " text and attributes only from the internal buffer. redraw *** ../vim-8.1.1954/src/testdir/test49.vim 2019-05-24 17:32:57.351719237 +0200 --- src/testdir/test49.vim 2019-09-01 14:36:29.848231705 +0200 *************** *** 521,527 **** " " Create a script that consists of the body of the function a:funcname. " Replace any ":return" by a ":finish", any argument variable by a global ! " variable, and and every ":call" by a ":source" for the next following argument " in the variable argument list. This function is useful if similar tests are " to be made for a ":return" from a function call or a ":finish" in a script " file. --- 521,527 ---- " " Create a script that consists of the body of the function a:funcname. " Replace any ":return" by a ":finish", any argument variable by a global ! " variable, and every ":call" by a ":source" for the next following argument " in the variable argument list. This function is useful if similar tests are " to be made for a ":return" from a function call or a ":finish" in a script " file. *** ../vim-8.1.1954/src/testdir/test_autocmd.vim 2019-08-14 21:12:00.977833219 +0200 --- src/testdir/test_autocmd.vim 2019-09-01 14:36:29.848231705 +0200 *************** *** 1091,1097 **** call assert_equal(g:opt[0], g:opt[1]) ! " 33: Test autocomands when an option value is converted internally. noa set backspace=1 " Reset global and local value (without triggering autocmd) let g:options=[['backspace', 'indent,eol', 'indent,eol', 'indent,eol', '2', 'global', 'set']] set backspace=2 --- 1091,1097 ---- call assert_equal(g:opt[0], g:opt[1]) ! " 33: Test autocommands when an option value is converted internally. noa set backspace=1 " Reset global and local value (without triggering autocmd) let g:options=[['backspace', 'indent,eol', 'indent,eol', 'indent,eol', '2', 'global', 'set']] set backspace=2 *** ../vim-8.1.1954/src/testdir/test_cindent.vim 2019-08-23 22:31:33.213176889 +0200 --- src/testdir/test_cindent.vim 2019-09-01 14:36:29.848231705 +0200 *************** *** 815,821 **** } } ! public: // <-- this was incoreectly indented before!! void testfall(); protected: void testfall(); --- 815,821 ---- } } ! public: // <-- this was incorectly indented before!! void testfall(); protected: void testfall(); *************** *** 1780,1786 **** } } ! public: // <-- this was incoreectly indented before!! void testfall(); protected: void testfall(); --- 1780,1786 ---- } } ! public: // <-- this was incorectly indented before!! void testfall(); protected: void testfall(); *** ../vim-8.1.1954/src/testdir/test_const.vim 2019-06-24 00:58:02.908020514 +0200 --- src/testdir/test_const.vim 2019-09-01 14:36:29.848231705 +0200 *************** *** 125,131 **** unlet s:x endfunc ! func Test_descructuring_with_lock() const [a, b, c] = [1, 1.1, 'vim'] call assert_fails('let a = 1', 'E741:') --- 125,131 ---- unlet s:x endfunc ! func Test_destructuring_with_lock() const [a, b, c] = [1, 1.1, 'vim'] call assert_fails('let a = 1', 'E741:') *** ../vim-8.1.1954/src/testdir/test_popupwin.vim 2019-08-30 22:07:55.950547106 +0200 --- src/testdir/test_popupwin.vim 2019-09-01 14:36:29.848231705 +0200 *************** *** 1857,1863 **** let winid = popup_create('something', #{filter: function('MyPopupFilter', [{}])}) call test_garbagecollect_now() redraw ! " Must not crach caused by invalid memory access call feedkeys('j', 'xt') call assert_true(v:true) --- 1857,1863 ---- let winid = popup_create('something', #{filter: function('MyPopupFilter', [{}])}) call test_garbagecollect_now() redraw ! " Must not crash caused by invalid memory access call feedkeys('j', 'xt') call assert_true(v:true) *** ../vim-8.1.1954/src/testdir/test_quickfix.vim 2019-06-24 00:58:02.912020499 +0200 --- src/testdir/test_quickfix.vim 2019-09-01 14:36:29.852231690 +0200 *************** *** 1667,1673 **** call assert_equal(1, bufwinnr('Xqftestfile3')) " If only quickfix window is open in the current tabpage, jumping to an ! " entry with 'switchubf' set to 'usetab' should search in other tabpages. enew | only set switchbuf=usetab tabedit Xqftestfile1 --- 1667,1673 ---- call assert_equal(1, bufwinnr('Xqftestfile3')) " If only quickfix window is open in the current tabpage, jumping to an ! " entry with 'switchbuf' set to 'usetab' should search in other tabpages. enew | only set switchbuf=usetab tabedit Xqftestfile1 *** ../vim-8.1.1954/src/testdir/test_search.vim 2019-08-24 20:49:58.825320302 +0200 --- src/testdir/test_search.vim 2019-09-01 14:36:29.852231690 +0200 *************** *** 267,273 **** " nor "/foo\\" works to delete the commandline. " In that case Vim should return "E35 no previous regular expression", " but it looks like Vim still sees /foo and therefore the test fails. ! " Therefore, disableing this test "call assert_fails(feedkeys("/foo\\", 'tx'), 'E35') "call assert_equal({'lnum': 1, 'leftcol': 0, 'col': 0, 'topfill': 0, 'topline': 1, 'coladd': 0, 'skipcol': 0, 'curswant': 0}, winsaveview()) --- 267,273 ---- " nor "/foo\\" works to delete the commandline. " In that case Vim should return "E35 no previous regular expression", " but it looks like Vim still sees /foo and therefore the test fails. ! " Therefore, disabling this test "call assert_fails(feedkeys("/foo\\", 'tx'), 'E35') "call assert_equal({'lnum': 1, 'leftcol': 0, 'col': 0, 'topfill': 0, 'topline': 1, 'coladd': 0, 'skipcol': 0, 'curswant': 0}, winsaveview()) *** ../vim-8.1.1954/src/testdir/test_tabpage.vim 2019-06-06 16:12:05.927134625 +0200 --- src/testdir/test_tabpage.vim 2019-09-01 14:36:29.852231690 +0200 *************** *** 58,64 **** q " " ! " Test for ":tab drop multi-opend-file" to keep current tabpage and window. new test1 tabnew new test1 --- 58,64 ---- q " " ! " Test for ":tab drop multi-opened-file" to keep current tabpage and window. new test1 tabnew new test1 *** ../vim-8.1.1954/src/testdir/test_tcl.vim 2019-06-15 17:57:43.976724009 +0200 --- src/testdir/test_tcl.vim 2019-09-01 14:36:29.852231690 +0200 *************** *** 4,10 **** CheckFeature tcl " Helper function as there is no builtin tcleval() function similar ! " to perleval, luaevel(), pyeval(), etc. func TclEval(tcl_expr) let s = split(execute('tcl ' . a:tcl_expr), "\n") return (len(s) == 0) ? '' : s[-1] --- 4,10 ---- CheckFeature tcl " Helper function as there is no builtin tcleval() function similar ! " to perleval, luaeval(), pyeval(), etc. func TclEval(tcl_expr) let s = split(execute('tcl ' . a:tcl_expr), "\n") return (len(s) == 0) ? '' : s[-1] *** ../vim-8.1.1954/src/version.c 2019-08-31 22:16:30.774127008 +0200 --- src/version.c 2019-09-01 14:45:14.670003515 +0200 *************** *** 763,764 **** --- 763,766 ---- { /* Add new patch number below this line */ + /**/ + 1955, /**/ -- hundred-and-one symptoms of being an internet addict: 157. You fum through a magazine, you first check to see if it has a web address. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///