diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-10-06 00:35:33 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-10-06 17:56:41 -0400 |
| commit | dfd1c6c417847815fa6a7ed24b90f51e3000787a (patch) | |
| tree | b0b804cd66897e4dd75553353b691c4f5247e1aa /src | |
| parent | 779b188db6ade50f87565a8805ee7eee6bf0a2a7 (diff) | |
| download | rneovim-dfd1c6c417847815fa6a7ed24b90f51e3000787a.tar.gz rneovim-dfd1c6c417847815fa6a7ed24b90f51e3000787a.tar.bz2 rneovim-dfd1c6c417847815fa6a7ed24b90f51e3000787a.zip | |
vim-patch:8.1.1619: tests are not run with GUI on Travis
Problem: Tests are not run with GUI on Travis.
Solution: Add a testgui job. (Ozaki Kiichi, closes vim/vim#4609)
https://github.com/vim/vim/commit/435f9f06cac02c1d2e5c52435d36e80f4ad2a8bd
N/A patches for version.c:
vim-patch:8.1.1771: options test fails on MS-Windows
Problem: Options test fails on MS-Windows.
Solution: Add correct and incorrect values for 'completeslash'.
https://github.com/vim/vim/commit/d4404b4391a0cd3ab197e09bee7828c88882f6b2
vim-patch:8.1.2274: newlines in 'balloonexpr' result only work in the GUI
Problem: Newlines in 'balloonexpr' result only work in the GUI.
Solution: Also recognize newlines in the terminal. (closes vim/vim#5193)
https://github.com/vim/vim/commit/d1c1c823892d0713065934256f48e7f4e6609f99
vim-patch:8.2.0554: the GUI doesn't set t_Co
Problem: The GUI doesn't set t_Co.
Solution: In the GUI set t_Co to 256 * 256 * 256. (closes vim/vim#5903)
https://github.com/vim/vim/commit/acc770a10f65107131473ea2ab4ae5d429dfe172
vim-patch:8.2.1806: MS-Windows with Python: Vim freezes after import command
Problem: MS-Windows with Python: Vim freezes after import command.
Solution: Use either "NUL" or "CONIN$" when reopening stdin. (Yasuhiro
Matsumoto, closes vim/vim#7083)
https://github.com/vim/vim/commit/253b16a4abdad1df350b9ddd9a709520b063934c
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/testdir/test_highlight.vim | 14 | ||||
| -rw-r--r-- | src/nvim/testdir/test_mapping.vim | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/test_timers.vim | 2 |
3 files changed, 13 insertions, 5 deletions
diff --git a/src/nvim/testdir/test_highlight.vim b/src/nvim/testdir/test_highlight.vim index 6aa187b17e..00e42733a7 100644 --- a/src/nvim/testdir/test_highlight.vim +++ b/src/nvim/testdir/test_highlight.vim @@ -596,9 +596,17 @@ endfunc " This test must come before the Test_cursorline test, as it appears this " defines the Normal highlighting group anyway. func Test_1_highlight_Normalgroup_exists() - " MS-Windows GUI sets the font - if !has('win32') || !has('gui_running') - let hlNormal = HighlightArgs('Normal') + let hlNormal = HighlightArgs('Normal') + if !has('gui_running') call assert_match('hi Normal\s*clear', hlNormal) + elseif has('gui_gtk2') || has('gui_gnome') || has('gui_gtk3') + " expect is DEFAULT_FONT of gui_gtk_x11.c + call assert_match('hi Normal\s*font=Monospace 10', hlNormal) + elseif has('gui_motif') || has('gui_athena') + " expect is DEFAULT_FONT of gui_x11.c + call assert_match('hi Normal\s*font=7x13', hlNormal) + elseif has('win32') + " expect any font + call assert_match('hi Normal\s*font=.*', hlNormal) endif endfunc diff --git a/src/nvim/testdir/test_mapping.vim b/src/nvim/testdir/test_mapping.vim index dd0da5db64..1a6b64e858 100644 --- a/src/nvim/testdir/test_mapping.vim +++ b/src/nvim/testdir/test_mapping.vim @@ -392,7 +392,7 @@ func Test_motionforce_omap() endfunc func Test_error_in_map_expr() - if !has('terminal') || (has('win32') && has('gui_running')) + if !has('terminal') || has('gui_running') throw 'Skipped: cannot run Vim in a terminal window' endif diff --git a/src/nvim/testdir/test_timers.vim b/src/nvim/testdir/test_timers.vim index c3b03fe1a5..ddf0ec61b2 100644 --- a/src/nvim/testdir/test_timers.vim +++ b/src/nvim/testdir/test_timers.vim @@ -341,7 +341,7 @@ func Test_nocatch_garbage_collect() endfunc func Test_error_in_timer_callback() - if !has('terminal') || (has('win32') && has('gui_running')) + if !has('terminal') || has('gui_running') throw 'Skipped: cannot run Vim in a terminal window' endif |