aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-12-28 13:46:54 -0500
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-12-28 18:33:50 -0500
commit0e913a08129b3e0e4d2d81eb424c9481c7aaee1c (patch)
tree13ed2a3e86ea0eb39f442ac50281f6b505374ac6
parenta58c5509d94f01f4a4edd6b4784f8d00b70af5b3 (diff)
downloadrneovim-0e913a08129b3e0e4d2d81eb424c9481c7aaee1c.tar.gz
rneovim-0e913a08129b3e0e4d2d81eb424c9481c7aaee1c.tar.bz2
rneovim-0e913a08129b3e0e4d2d81eb424c9481c7aaee1c.zip
vim-patch:8.2.2234: command line wildmenu test often fails with Unix GUI
Problem: Command line wildmenu test often fails with Unix GUI. Solution: Skip the test where it is expected to fail. https://github.com/vim/vim/commit/3e112acc220dcacb58d77edca71910a532fffd0f Include modeline fix for ASAN build. N/A patches for version.c: vim-patch:8.2.1785: compiler warning for strcp() out of bounds Problem: Compiler warning for strcp() out of bounds. (Christian Brabandt) Solution: use memmove() instead. https://github.com/vim/vim/commit/3f974ff45e0ea4b85fea7d8768f005d8a2c7941e vim-patch:8.2.2235: build failure with some Ruby versions Problem: Build failure with some Ruby versions. Solution: Adjust the code for Ruby 3.0. (Ozaki Kiichi, closes vim/vim#7564) https://github.com/vim/vim/commit/dace9f785fca6cc802b2fb7f11a5ee4fab896432 vim-patch:8.2.2237: CI on Mac fails in sed command Problem: CI on Mac fails in sed command. Solution: Set LC_ALL to "C". (Ozaki Kiichi, closes vim/vim#7565) https://github.com/vim/vim/commit/ed1e4c9a70aaa7de56bac23e75a846e874a32a56 vim-patch:8.2.2241: Build with Ruby and clang may fail Problem: Build with Ruby and clang may fail. Solution: Adjust congigure and sed script. (Ozaki Kiichi, closes vim/vim#7566) https://github.com/vim/vim/commit/864a28b6a6ae4f1a56e230be26bc6d13e3f8b3d9
-rw-r--r--src/nvim/testdir/test_cmdline.vim29
1 files changed, 16 insertions, 13 deletions
diff --git a/src/nvim/testdir/test_cmdline.vim b/src/nvim/testdir/test_cmdline.vim
index bb0cae4819..39f865144a 100644
--- a/src/nvim/testdir/test_cmdline.vim
+++ b/src/nvim/testdir/test_cmdline.vim
@@ -51,18 +51,21 @@ func Test_complete_wildmenu()
call feedkeys(":e Xdir1/\<Tab>\<Down>\<Up>\<Right>\<CR>", 'tx')
call assert_equal('testfile1', getline(1))
- + " <C-J>/<C-K> mappings to go up/down directories when 'wildcharm' is
- " different than 'wildchar'.
- set wildcharm=<C-Z>
- cnoremap <C-J> <Down><C-Z>
- cnoremap <C-K> <Up><C-Z>
- call feedkeys(":e Xdir1/\<Tab>\<C-J>\<CR>", 'tx')
- call assert_equal('testfile3', getline(1))
- call feedkeys(":e Xdir1/\<Tab>\<C-J>\<C-K>\<CR>", 'tx')
- call assert_equal('testfile1', getline(1))
- set wildcharm=0
- cunmap <C-J>
- cunmap <C-K>
+ " this fails in some Unix GUIs, not sure why
+ if !has('unix') || !has('gui_running')
+ " <C-J>/<C-K> mappings to go up/down directories when 'wildcharm' is
+ " different than 'wildchar'.
+ set wildcharm=<C-Z>
+ cnoremap <C-J> <Down><C-Z>
+ cnoremap <C-K> <Up><C-Z>
+ call feedkeys(":e Xdir1/\<Tab>\<C-J>\<CR>", 'tx')
+ call assert_equal('testfile3', getline(1))
+ call feedkeys(":e Xdir1/\<Tab>\<C-J>\<C-K>\<CR>", 'tx')
+ call assert_equal('testfile1', getline(1))
+ set wildcharm=0
+ cunmap <C-J>
+ cunmap <C-K>
+ endif
" cleanup
%bwipe
@@ -1001,4 +1004,4 @@ func Test_read_shellcmd()
endif
endfunc
-" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab
+" vim: shiftwidth=2 sts=2 expandtab