To: vim_dev@googlegroups.com Subject: Patch 8.2.2030 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.2030 Problem: Some tests fail on Mac. Solution: Avoid Mac test failures. Add additional test for wildmenu. (Yegappan Lakshmanan, closes #7341) Files: src/testdir/runtest.vim, src/testdir/test_cmdline.vim, src/testdir/test_options.vim, src/testdir/test_popupwin.vim *** ../vim-8.2.2029/src/testdir/runtest.vim 2020-10-03 12:57:23.014572543 +0200 --- src/testdir/runtest.vim 2020-11-21 21:31:30.176447597 +0100 *************** *** 136,141 **** --- 136,148 ---- let s:t_normal = &t_me endif + if has('mac') + " In MacOS, when starting a shell in a terminal, a bash deprecation warning + " message is displayed. This breaks the terminal test. Disable the warning + " message. + let $BASH_SILENCE_DEPRECATION_WARNING = 1 + endif + " Prepare for calling test_garbagecollect_now(). let v:testing = 1 *** ../vim-8.2.2029/src/testdir/test_cmdline.vim 2020-10-05 20:07:14.413414315 +0200 --- src/testdir/test_cmdline.vim 2020-11-21 21:31:30.176447597 +0100 *************** *** 84,90 **** call delete('Xdir1', 'd') set nowildmenu endfunc ! f func Test_wildmenu_screendump() CheckScreendump --- 84,90 ---- call delete('Xdir1', 'd') set nowildmenu endfunc ! func Test_wildmenu_screendump() CheckScreendump *************** *** 112,118 **** call delete('XTest_wildmenu') endfunc - func Test_map_completion() CheckFeature cmdline_compl call feedkeys(":map \\"\", 'xt') --- 112,117 ---- *************** *** 1631,1634 **** --- 1630,1663 ---- endif endfunc + " Test for going up and down the directory tree using 'wildmenu' + func Test_wildmenu_dirstack() + CheckUnix + %bw! + call mkdir('Xdir1/dir2/dir3', 'p') + call writefile([], 'Xdir1/file1_1.txt') + call writefile([], 'Xdir1/file1_2.txt') + call writefile([], 'Xdir1/dir2/file2_1.txt') + call writefile([], 'Xdir1/dir2/file2_2.txt') + call writefile([], 'Xdir1/dir2/dir3/file3_1.txt') + call writefile([], 'Xdir1/dir2/dir3/file3_2.txt') + cd Xdir1/dir2/dir3 + set wildmenu + + call feedkeys(":e \\\"\", 'xt') + call assert_equal('"e file3_1.txt', @:) + call feedkeys(":e \\\\"\", 'xt') + call assert_equal('"e ../dir3/', @:) + call feedkeys(":e \\\\\"\", 'xt') + call assert_equal('"e ../../dir2/', @:) + call feedkeys(":e \\\\\\"\", 'xt') + call assert_equal('"e ../../dir2/dir3/', @:) + call feedkeys(":e \\\\\\\"\", 'xt') + call assert_equal('"e ../../dir2/dir3/file3_1.txt', @:) + + cd - + call delete('Xdir1', 'rf') + set wildmenu& + endfunc + " vim: shiftwidth=2 sts=2 expandtab *** ../vim-8.2.2029/src/testdir/test_options.vim 2020-10-26 21:05:23.905469139 +0100 --- src/testdir/test_options.vim 2020-11-21 21:31:30.176447597 +0100 *************** *** 815,821 **** CheckUnix let save_shell = &shell set shell= ! call assert_fails('shell', 'E91:') let &shell = save_shell endfunc --- 815,827 ---- CheckUnix let save_shell = &shell set shell= ! let caught_e91 = 0 ! try ! shell ! catch /E91:/ ! let caught_e91 = 1 ! endtry ! call assert_equal(1, caught_e91) let &shell = save_shell endfunc *** ../vim-8.2.2029/src/testdir/test_popupwin.vim 2020-11-15 14:09:34.100728303 +0100 --- src/testdir/test_popupwin.vim 2020-11-21 21:31:30.176447597 +0100 *************** *** 605,610 **** --- 605,611 ---- endfor %foldclose set shell=/bin/sh noruler + unlet $PROMPT_COMMAND let $PS1 = 'vim> ' terminal ++rows=4 $wincmd w *** ../vim-8.2.2029/src/version.c 2020-11-21 14:16:18.536766447 +0100 --- src/version.c 2020-11-21 21:29:43.496816717 +0100 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 2030, /**/ -- TALL KNIGHT: We shall say Ni! again to you if you do not appease us. ARTHUR: All right! What do you want? TALL KNIGHT: We want ... a shrubbery! "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// 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 ///