Mercurial > vim
changeset 17239:fceb0977275a v8.1.1619
patch 8.1.1619: tests are not run with GUI on Travis
commit https://github.com/vim/vim/commit/435f9f06cac02c1d2e5c52435d36e80f4ad2a8bd
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Jul 3 21:40:16 2019 +0200
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 https://github.com/vim/vim/issues/4609)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 03 Jul 2019 21:45:06 +0200 |
| parents | 20364f6b5e9b |
| children | c8a73240f8aa |
| files | .travis.yml src/testdir/test_highlight.vim src/testdir/test_mapping.vim src/testdir/test_timers.vim src/version.c |
| diffstat | 5 files changed, 22 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/.travis.yml +++ b/.travis.yml @@ -214,5 +214,12 @@ matrix: - *linux-huge - *asan after_failure: *asan_symbolize + - <<: *linux + name: huge-testgui+coverage/gcc + compiler: gcc + env: + - *linux-huge + - TEST="-C src testgui" + after_success: *coverage # vim:set sts=2 sw=2 tw=0 et:
--- a/src/testdir/test_highlight.vim +++ b/src/testdir/test_highlight.vim @@ -601,10 +601,18 @@ 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
--- a/src/testdir/test_mapping.vim +++ b/src/testdir/test_mapping.vim @@ -399,7 +399,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
--- a/src/testdir/test_timers.vim +++ b/src/testdir/test_timers.vim @@ -334,7 +334,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