mirror of
https://github.com/vim/vim.git
synced 2025-09-25 03:54:15 -04:00
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 #4609)
This commit is contained in:
@@ -214,5 +214,12 @@ matrix:
|
|||||||
- *linux-huge
|
- *linux-huge
|
||||||
- *asan
|
- *asan
|
||||||
after_failure: *asan_symbolize
|
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:
|
# vim:set sts=2 sw=2 tw=0 et:
|
||||||
|
@@ -601,10 +601,18 @@ endfunc
|
|||||||
" This test must come before the Test_cursorline test, as it appears this
|
" This test must come before the Test_cursorline test, as it appears this
|
||||||
" defines the Normal highlighting group anyway.
|
" defines the Normal highlighting group anyway.
|
||||||
func Test_1_highlight_Normalgroup_exists()
|
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)
|
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
|
endif
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
@@ -399,7 +399,7 @@ func Test_motionforce_omap()
|
|||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
func Test_error_in_map_expr()
|
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'
|
throw 'Skipped: cannot run Vim in a terminal window'
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@@ -334,7 +334,7 @@ func Test_nocatch_garbage_collect()
|
|||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
func Test_error_in_timer_callback()
|
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'
|
throw 'Skipped: cannot run Vim in a terminal window'
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@@ -777,6 +777,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1619,
|
||||||
/**/
|
/**/
|
||||||
1618,
|
1618,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user