diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-07-03 21:40:16 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-07-03 21:40:16 +0200 |
| commit | 435f9f06cac02c1d2e5c52435d36e80f4ad2a8bd (patch) | |
| tree | 134b8a742fcab1b3941fe9270322dd424c96abd2 | |
| parent | 9ee3d161f715de9e68ba60c17e3893107bb7c42a (diff) | |
| download | vim-git-435f9f06cac02c1d2e5c52435d36e80f4ad2a8bd.tar.gz | |
patch 8.1.1619: tests are not run with GUI on Travisv8.1.1619
Problem: Tests are not run with GUI on Travis.
Solution: Add a testgui job. (Ozaki Kiichi, closes #4609)
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rw-r--r-- | src/testdir/test_highlight.vim | 14 | ||||
| -rw-r--r-- | src/testdir/test_mapping.vim | 2 | ||||
| -rw-r--r-- | src/testdir/test_timers.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
5 files changed, 22 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 8e122404f..b669a908f 100644 --- 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: diff --git a/src/testdir/test_highlight.vim b/src/testdir/test_highlight.vim index f21ebd7e2..249954343 100644 --- 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 diff --git a/src/testdir/test_mapping.vim b/src/testdir/test_mapping.vim index 7f90b0385..184e1a451 100644 --- 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 diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim index de13bcbe8..ee86e2a97 100644 --- 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 diff --git a/src/version.c b/src/version.c index 10e4c40d8..e86b5bf2c 100644 --- a/src/version.c +++ b/src/version.c @@ -778,6 +778,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1619, +/**/ 1618, /**/ 1617, |